Bug 1013453 - Port bug 1011458 to comm-central, rs=build system port by peer, a=bustage-fix to reopen a CLOSED TREE.
authorJoshua Cranmer <Pidgeot18@gmail.com>
Tue, 20 May 2014 14:39:05 -0500
changeset 20126 a6618c8ea3a232333493b073ea11870274e09c53
parent 20125 d853681a4c050c1ff9b7a22917b2e88ce8809026
child 20127 2c7560d1333945771b1c65d8541073901e05b617
push id1179
push userCallek@gmail.com
push dateMon, 21 Jul 2014 20:52:37 +0000
treeherdercomm-beta@84d8ef10a503 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbuild, bustage-fix
bugs1013453, 1011458
Bug 1013453 - Port bug 1011458 to comm-central, rs=build system port by peer, a=bustage-fix to reopen a CLOSED TREE.
build/macosx/universal/flight.mk
calendar/lightning/lightning-tests.mk
mail/test/mozmill/Makefile.in
mail/testsuite-targets.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -29,31 +29,31 @@ postflight_all:
 # Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
 # actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
 	$(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
 	   PKG_SKIP_STRIP=1 stage-package
 ifdef ENABLE_TESTS
 # Now, repeat the process for the test package.
 	$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
-	rm -rf $(DIST_UNI)/test-package-stage
+	rm -rf $(DIST_UNI)/test-stage
 # automation.py differs because it hardcodes a path to
 # dist/bin. It doesn't matter which one we use.
-	if test -d $(DIST_ARCH_1)/test-package-stage -a                 \
-                -d $(DIST_ARCH_2)/test-package-stage; then              \
-           cp $(DIST_ARCH_1)/test-package-stage/mochitest/automation.py \
-             $(DIST_ARCH_2)/test-package-stage/mochitest/;              \
-           cp $(DIST_ARCH_1)/test-package-stage/xpcshell/automation.py   \
-             $(DIST_ARCH_2)/test-package-stage/xpcshell/;                \
-           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/;              \
+	if test -d $(DIST_ARCH_1)/test-stage -a                 \
+                -d $(DIST_ARCH_2)/test-stage; then              \
+           cp $(DIST_ARCH_1)/test-stage/mochitest/automation.py \
+             $(DIST_ARCH_2)/test-stage/mochitest/;              \
+           cp $(DIST_ARCH_1)/test-stage/xpcshell/automation.py   \
+             $(DIST_ARCH_2)/test-stage/xpcshell/;                \
+           cp $(DIST_ARCH_1)/test-stage/reftest/automation.py   \
+             $(DIST_ARCH_2)/test-stage/reftest/;                \
+           if test -e $(DIST_ARCH_1)/test-stage/mozmill/automation.py; then \
+             cp $(DIST_ARCH_1)/test-stage/mozmill/automation.py \
+               $(DIST_ARCH_2)/test-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; \
+	      $(DIST_ARCH_1)/test-stage                         \
+	      $(DIST_ARCH_2)/test-stage                         \
+	      $(DIST_UNI)/test-stage; \
 	fi
 endif
--- a/calendar/lightning/lightning-tests.mk
+++ b/calendar/lightning/lightning-tests.mk
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifndef UNIVERSAL_BINARY
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 else
-PKG_STAGE = $(DIST)/universal/test-package-stage
+PKG_STAGE = $(DIST)/universal/test-stage
 endif
 
 # This is the target that should be called externally
 stage-package: stage-extension stage-mozmill
 
 # stage the extension, avoiding per-platform differences so that the mac unify
 # target works.
 stage-extension:
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -55,14 +55,14 @@ mozmill-virtualenv:
 	$(INSTALL) $(topsrcdir)/mozilla/python/virtualenv $(_DEST_DIR)/resources/
 	rm -rf $(VIRTUALENV_DIR) && \
 	mkdir $(VIRTUALENV_DIR) && \
 	unset MACOSX_DEPLOYMENT_TARGET && \
 	$(PYTHON) $(_DEST_DIR)/resources/installmozmill.py $(VIRTUALENV_DIR)
 
 libs:: mozmill-virtualenv
 
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/
 	@(cd $(topsrcdir)/mail/test/mozmill && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/ && tar -xf -)
 	@(cd $(MOZDEPTH)/_tests/mozmill && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/ && tar -xf -)
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -45,27 +45,27 @@ mozmill-one:
 	--symbols-path=$(abspath $(DIST)/crashreporter-symbols) \
 	--plugins-path=$(abspath $(DIST)/plugins) \
 	$(MOZMILL_EXTRA)
 
 # XXX The mozilla/testing/testsuite-targets.mk doesn't really allow for hooks
 # outside of itself. Therefore we replicate the functionality we need here,
 # calling into the relevant mozilla dirs when necessary for the core tests.
 ifndef UNIVERSAL_BINARY
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 package-tests:: stage-mozilla-tests stage-mozmill stage-modules
 
 # If Lightning is enabled, also stage the lightning extension
 ifdef MOZ_CALENDAR
 package-tests:: stage-calendar
 endif
 
 else
 # This staging area has been built for us by universal/flight.mk
-PKG_STAGE = $(DIST)/universal/test-package-stage
+PKG_STAGE = $(DIST)/universal/test-stage
 endif
 
 package-tests::
 	@rm -f "$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)"
 ifndef UNIVERSAL_BINARY
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 endif
 	cd $(PKG_STAGE) && \