Bug 1011458 - Buy back a few characters for Windows paths by renaming tests staging directory. r=ted

2024-09-13 09:24:08 -07:00 · 2014-05-16 04:55:00 +02:00 · 2014-05-16 04:55:00 +02:00 · 41dd2b2604
commit 41dd2b2604
parent 516194309e
11 changed files with 30 additions and 30 deletions
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@ -28,7 +28,7 @@ TEST_FILES = \
 # 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
@ -33,25 +33,25 @@ 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
@ -131,8 +131,8 @@ function writeUpdatesToWebappManifest(aRestore)
  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/
--- a/js/src/tests/Makefile.in
+++ b/js/src/tests/Makefile.in
@ -32,7 +32,7 @@ TEST_FILES = \
  test262/ \
  $(NULL)

-PKG_STAGE = $(DIST)/test-package-stage
+PKG_STAGE = $(DIST)/test-stage

 # stage tests for packaging
 stage-package:
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@ -76,7 +76,7 @@ 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:
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@ -163,7 +163,7 @@ TEST_HARNESS_PLUGINS := \
 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):
--- a/testing/mozbase/Makefile.in
+++ b/testing/mozbase/Makefile.in
@ -39,7 +39,7 @@ libs:: $(MOZBASE_PACKAGES)
 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 -)
--- a/testing/profiles/Makefile.in
+++ b/testing/profiles/Makefile.in
@ -14,7 +14,7 @@ _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
@ -280,11 +280,11 @@ 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)
@ -393,7 +393,7 @@ pgo-profile-run:
 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 \
@ -411,7 +411,7 @@ package-tests: \
  $(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:
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@ -46,7 +46,7 @@ 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
--- a/toolkit/mozapps/installer/linux/rpm/mozilla.spec
+++ b/toolkit/mozapps/installer/linux/rpm/mozilla.spec
@ -81,7 +81,7 @@ rm icons.list #cleanup
 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