Bug 1011458 - Buy back a few characters for Windows paths by renaming tests staging directory. r=ted
authorJames Graham <james@hoppipolla.co.uk>
Fri, 16 May 2014 04:55:00 +0200
changeset 183843 5acdf68ae43d959d5032e057f9b86391a553a916
parent 183842 1a3225533557b3ae564a19ae267c7521884e8d67
child 183844 79f9c9553e29455ddc00ff5c346608db7996fd27
push id43694
push usercbook@mozilla.com
push dateTue, 20 May 2014 08:03:52 +0000
treeherdermozilla-inbound@307078994617 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1011458
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1011458 - Buy back a few characters for Windows paths by renaming tests staging directory. r=ted
addon-sdk/Makefile.in
build/macosx/universal/flight.mk
dom/tests/browser/browser_webapps_perms_reinstall.js
js/src/tests/Makefile.in
layout/tools/reftest/Makefile.in
testing/mochitest/Makefile.in
testing/mozbase/Makefile.in
testing/profiles/Makefile.in
testing/testsuite-targets.mk
testing/xpcshell/Makefile.in
toolkit/mozapps/installer/linux/rpm/mozilla.spec
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -23,12 +23,12 @@ TEST_FILES = \
   source/test \
   source/package.json \
   source/mapping.json \
   $(NULL)
 
 # Remove this once the test harness uses the APIs built into Firefox
 TEST_FILES += source/lib
 
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 
 stage-tests-package:: $(TEST_FILES)
 	$(INSTALL) $^ $(PKG_STAGE)/jetpack
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -28,30 +28,30 @@ 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 -RL $(DIST_ARCH_1)/test-package-stage/mochitest/extensions/specialpowers \
-             $(DIST_ARCH_2)/test-package-stage/mochitest/extensions/;              \
-           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/;                \
-           cp -RL $(DIST_ARCH_1)/test-package-stage/reftest/specialpowers \
-             $(DIST_ARCH_2)/test-package-stage/reftest/;              \
+	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 -RL $(DIST_ARCH_1)/test-stage/mochitest/extensions/specialpowers \
+             $(DIST_ARCH_2)/test-stage/mochitest/extensions/;              \
+           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/;                \
+           cp -RL $(DIST_ARCH_1)/test-stage/reftest/specialpowers \
+             $(DIST_ARCH_2)/test-stage/reftest/;              \
            $(TOPSRCDIR)/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
+             $(DIST_ARCH_1)/test-stage                          \
+             $(DIST_ARCH_2)/test-stage                          \
+             $(DIST_UNI)/test-stage; fi
 endif
--- a/dom/tests/browser/browser_webapps_perms_reinstall.js
+++ b/dom/tests/browser/browser_webapps_perms_reinstall.js
@@ -126,18 +126,18 @@ function writeUpdatesToWebappManifest(aR
 {
   let newfile = Cc["@mozilla.org/file/directory_service;1"].
                   getService(Ci.nsIProperties).
                   get("XCurProcD", Ci.nsIFile);
 
   let devPath = ["_tests", "testing", "mochitest",
                  "browser", "dom" , "tests", "browser"];
   // make package-tests moves tests to:
-  // dist/test-package-stage/mochitest/browser/dom/tests/browser
-  let slavePath = ["dist", "test-package-stage", "mochitest",
+  // dist/test-stage/mochitest/browser/dom/tests/browser
+  let slavePath = ["dist", "test-stage", "mochitest",
                    "browser", "dom", "tests", "browser"];
 
   newfile = newfile.parent; // up to dist/
   newfile = newfile.parent;// up to obj-dir/
 
   info(newfile.path);
   try {
     for (let idx in devPath) {
--- a/js/src/tests/Makefile.in
+++ b/js/src/tests/Makefile.in
@@ -27,15 +27,15 @@ TEST_FILES = \
   js1_6/ \
   js1_7/ \
   js1_8/ \
   js1_8_1/ \
   js1_8_5/ \
   test262/ \
   $(NULL)
 
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 
 # stage tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/jsreftest/tests
 	(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -)
 	$(PYTHON) $(srcdir)/jstests.py --make-manifests $(PKG_STAGE)/jsreftest/tests/
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -71,17 +71,17 @@ endif
 
 $(_HARNESS_FILES): $(_DEST_DIR)
 
 # copy harness and the reftest extension bits to $(_DEST_DIR)
 copy-harness: $(_HARNESS_FILES) $(addprefix $(_DEST_DIR)/,$(_HARNESS_PP_FILES))
 	$(INSTALL) $(_HARNESS_FILES) $(_DEST_DIR)
 	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - reftest) | (cd $(_DEST_DIR) && tar -xf -)
 
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 
 # stage harness and tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/reftest && $(NSINSTALL) -D $(PKG_STAGE)/reftest/tests
 	(cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -)
 	$(PYTHON) $(topsrcdir)/layout/tools/reftest/print-manifest-dirs.py \
           $(topsrcdir) \
           $(topsrcdir)/layout/reftests/reftest.list \
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -158,17 +158,17 @@ TEST_HARNESS_PLUGINS := \
 else
 TEST_HARNESS_PLUGINS := \
   $(DLL_PREFIX)nptest$(DLL_SUFFIX) \
   $(DLL_PREFIX)npsecondtest$(DLL_SUFFIX) \
   $(DLL_PREFIX)nptestjava$(DLL_SUFFIX)
 endif
 
 # Rules for staging the necessary harness bits for a test package
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 DIST_BIN = $(DIST)/bin
 
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins && $(NSINSTALL) -D $(DIST)/plugins
 	cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest
--- a/testing/mozbase/Makefile.in
+++ b/testing/mozbase/Makefile.in
@@ -34,13 +34,13 @@ MOZBASE_EXTRAS = \
   $(NULL)
 
 _DEST_DIR = $(DEPTH)/_tests/mozbase
 libs:: $(MOZBASE_PACKAGES)
 	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
 libs:: $(MOZBASE_EXTRAS)
 	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
 
-stage-package: PKG_STAGE = $(DIST)/test-package-stage
+stage-package: PKG_STAGE = $(DIST)/test-stage
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mozbase
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(MOZBASE_PACKAGES)) | (cd $(PKG_STAGE)/mozbase && tar -xf -)
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(MOZBASE_EXTRAS)) | (cd $(PKG_STAGE)/mozbase && tar -xf -)
--- a/testing/profiles/Makefile.in
+++ b/testing/profiles/Makefile.in
@@ -9,12 +9,12 @@ MOCHITEST_PROFILE_FILES = \
   prefs_b2g_unittest.js \
   webapps_mochitest.json \
   $(NULL)
 
 _DEST_DIR = $(DEPTH)/_tests/testing/mochitest/profile_data
 libs:: $(MOCHITEST_PROFILE_FILES)
 	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
 
-stage-package: PKG_STAGE = $(DIST)/test-package-stage
+stage-package: PKG_STAGE = $(DIST)/test-stage
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(MOCHITEST_PROFILE_FILES)) | (cd $(PKG_STAGE)/mochitest/profile_data && tar -xf -)
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -275,21 +275,21 @@ crashtest-ipc:
 	$(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT))
 	$(CHECK_TEST_ERROR)
 
 crashtest-ipc-gpu: TEST_PATH?=testing/crashtest/crashtests.list
 crashtest-ipc-gpu:
 	$(call RUN_REFTEST,'$(topsrcdir)/$(TEST_PATH)' $(OOP_CONTENT) $(GPU_RENDERING))
 	$(CHECK_TEST_ERROR)
 
-jstestbrowser: TESTS_PATH?=test-package-stage/jsreftest/tests/
+jstestbrowser: TESTS_PATH?=test-stage/jsreftest/tests/
 jstestbrowser:
 	$(MAKE) -C $(DEPTH)/config
 	$(MAKE) stage-jstests
-	$(call RUN_REFTEST,'$(DIST)/$(TESTS_PATH)/jstests.list' --extra-profile-file=$(DIST)/test-package-stage/jsreftest/tests/user.js)
+	$(call RUN_REFTEST,'$(DIST)/$(TESTS_PATH)/jstests.list' --extra-profile-file=$(DIST)/test-stage/jsreftest/tests/user.js)
 	$(CHECK_TEST_ERROR)
 
 GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)
 
 # Execute all xpcshell tests in the directories listed in the manifest.
 # See also config/rules.mk 'xpcshell-tests' target for local execution.
 # Usage: |make [TEST_PATH=...] [EXTRA_TEST_ARGS=...] xpcshell-tests|.
 xpcshell-tests:
@@ -388,17 +388,17 @@ leaktest:
 
 pgo-profile-run:
 	$(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
 
 # Package up the tests and test harnesses
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 ifndef UNIVERSAL_BINARY
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 package-tests: \
   stage-config \
   stage-mochitest \
   stage-reftest \
   stage-xpcshell \
   stage-jstests \
   stage-jetpack \
   stage-mozbase \
@@ -406,17 +406,17 @@ package-tests: \
   stage-modules \
   stage-marionette \
   stage-cppunittests \
   stage-jittest \
   stage-steeplechase \
   $(NULL)
 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
 	find $(PKG_STAGE) -name '*.pyc' -exec rm {} \;
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -41,17 +41,17 @@ TEST_HARNESS_COMPONENTS := \
   httpd.js \
   httpd.manifest \
   $(NULL)
 
 MOZINFO_FILES := \
   mozinfo.py
 
 # Rules for staging the necessary harness bits for a test package
-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage
 
 libs::
 	$(INSTALL) $(srcdir)/xpcshell_b2g.ini $(DEPTH)/_tests/xpcshell
 	$(INSTALL) $(srcdir)/xpcshell_android.ini $(DEPTH)/_tests/xpcshell
 	cp $(DEPTH)/_tests/xpcshell/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
--- a/toolkit/mozapps/installer/linux/rpm/mozilla.spec
+++ b/toolkit/mozapps/installer/linux/rpm/mozilla.spec
@@ -76,17 +76,17 @@ for i in $(cat icons.list) ; do
 done
 rm icons.list #cleanup
 
 %if %{?createtests:1}
 #wastefully creates a zip file, but ensures that we stage all test suites
 make package-tests
 testdir=$RPM_BUILD_ROOT/%{_datadir}/%{_testsinstalldir}/tests
 mkdir -p $testdir
-cp -a dist/test-package-stage/* $testdir/
+cp -a dist/test-stage/* $testdir/
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 #this is needed to get gnome-panel to update the icons