Bug 824163 - Properly specify the path to the user.js to be put into the jsreftest profile so that it's not affected by the test subset being run. r=ted
authorJeff Walden <jwalden@mit.edu>
Wed, 19 Dec 2012 17:32:22 -0500
changeset 117111 f9f27086d5de4f6a1035abdfa8339ea3f58c5398
parent 117110 c7da4138801e1b217d75e64bf0a41803676806e1
child 117112 268fe9874d9dfc3f883237c288578032eca04aeb
push id20315
push userjwalden@mit.edu
push dateThu, 27 Dec 2012 17:36:05 +0000
treeherdermozilla-inbound@268fe9874d9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs824163
milestone20.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 824163 - Properly specify the path to the user.js to be put into the jsreftest profile so that it's not affected by the test subset being run. r=ted
testing/testsuite-targets.mk
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -236,17 +236,17 @@ 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:
 	$(MAKE) -C $(DEPTH)/config
 	$(MAKE) -C $(DEPTH)/js/src/config
 	$(MAKE) stage-jstests
-	$(call RUN_REFTEST,$(DIST)/$(TESTS_PATH)/jstests.list --extra-profile-file=$(DIST)/$(TESTS_PATH)/user.js)
+	$(call RUN_REFTEST,$(DIST)/$(TESTS_PATH)/jstests.list --extra-profile-file=$(DIST)/test-package-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: