Bug 797452 Intermittent build/macosx/universal/unify failure: "copyIfIdentical: files differ" - sort manifest files for comparison when comparing them. r=irving,a=Standard8
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 04 Oct 2012 21:48:26 +0100
changeset 13522 85699b340a61ea21a472a29014ed46e475a0e3ea
parent 13521 19b3657563860d6c39fa94671da18e47eed5e1b1
child 13523 d09004ab873544af211e129e5508fb73f9301183
push idunknown
push userunknown
push dateunknown
reviewersirving, Standard8
bugs797452
Bug 797452 Intermittent build/macosx/universal/unify failure: "copyIfIdentical: files differ" - sort manifest files for comparison when comparing them. r=irving,a=Standard8
build/macosx/universal/flight.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -84,14 +84,15 @@ ifdef ENABLE_TESTS
              $(DIST_ARCH_2)/test-package-stage/mochitest/;              \
            cp $(DIST_ARCH_1)/test-package-stage/reftest/automation.py   \
              $(DIST_ARCH_2)/test-package-stage/reftest/;                \
            if test -e $(DIST_ARCH_1)/test-package-stage/mozmill/automation.py; then \
              cp $(DIST_ARCH_1)/test-package-stage/mozmill/automation.py \
                $(DIST_ARCH_2)/test-package-stage/mozmill/;              \
            fi; \
 	  $(TOPSRCDIR)/mozilla/build/macosx/universal/unify \
+	      --unify-with-sort "\.manifest$$" \
 	      --unify-with-sort "all-test-dirs\.list$$" \
 	      $(DIST_ARCH_1)/test-package-stage                         \
 	      $(DIST_ARCH_2)/test-package-stage                         \
 	      $(DIST_UNI)/test-package-stage; \
 	fi
 endif