From d616aeb19a38bb22f517bee6928e5f4580b75611 Mon Sep 17 00:00:00 2001
From: Joshua Cranmer <Pidgeot18@gmail.com>
Date: Tue, 20 May 2014 14:39:05 -0500
Subject: [PATCH] Bug 1013453 - Port bug 1011458 to comm-central, rs=build
 system port by peer, a=bustage-fix to reopen a CLOSED TREE.

--HG--
extra : rebase_source : ce1600dd57aaa380ce6f094167c00c78ac149380
---
 build/macosx/universal/flight.mk      | 30 +++++++++++++--------------
 calendar/lightning/lightning-tests.mk |  4 ++--
 mail/test/mozmill/Makefile.in         |  2 +-
 mail/testsuite-targets.mk             |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build/macosx/universal/flight.mk b/build/macosx/universal/flight.mk
index 96d7df8ee5..2956ed6aea 100644
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -34,26 +34,26 @@ 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
diff --git a/calendar/lightning/lightning-tests.mk b/calendar/lightning/lightning-tests.mk
index f087b5d763..b64df605be 100644
--- a/calendar/lightning/lightning-tests.mk
+++ b/calendar/lightning/lightning-tests.mk
@@ -3,9 +3,9 @@
 # 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
diff --git a/mail/test/mozmill/Makefile.in b/mail/test/mozmill/Makefile.in
index 8bc4051277..2cf34ed5a2 100644
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -60,7 +60,7 @@ mozmill-virtualenv:
 
 libs:: mozmill-virtualenv
 
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/
diff --git a/mail/testsuite-targets.mk b/mail/testsuite-targets.mk
index 10504f3faa..e89f894b53 100644
--- a/mail/testsuite-targets.mk
+++ b/mail/testsuite-targets.mk
@@ -50,7 +50,7 @@ mozmill-one:
 # 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
@@ -60,7 +60,7 @@ 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::