From c635e05980ef7e0d933f6aeb16520086e757e078 Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Tue, 17 Apr 2012 11:40:57 -0700 Subject: [PATCH] Bug 746236 - Fix make -C builddir jstestbrowser; r=ted.mielczarek Broken by Bug 735549. --- js/src/tests/Makefile.in | 1 - testing/testsuite-targets.mk | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/js/src/tests/Makefile.in b/js/src/tests/Makefile.in index 6f9950f9dbcb..a290f1533250 100644 --- a/js/src/tests/Makefile.in +++ b/js/src/tests/Makefile.in @@ -52,7 +52,6 @@ TEST_FILES = \ browser.js \ js-test-driver-end.js \ user.js \ - jstests.list \ e4x/ \ ecma/ \ ecma_2/ \ diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index c06095d66ffc..9a869a8e4367 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -224,9 +224,12 @@ crashtest-ipc-gpu: $(call RUN_REFTEST,$(topsrcdir)/$(TEST_PATH) $(OOP_CONTENT) $(GPU_RENDERING)) $(CHECK_TEST_ERROR) -jstestbrowser: TEST_PATH?=js/src/tests/jstests.list +jstestbrowser: TESTS_PATH?=test-package-stage/jsreftest/tests/ jstestbrowser: - $(call RUN_REFTEST,$(topsrcdir)/$(TEST_PATH) --extra-profile-file=$(topsrcdir)/js/src/tests/user.js) + $(MAKE) -C $(DEPTH)/config + $(MAKE) -C $(DEPTH)/js/src/config + $(MAKE) stage-jstests + $(call RUN_REFTEST,$(DIST)/$(TESTS_PATH)/jstests.list --extra-profile-file=$(TESTS_PATH)/user.js) $(CHECK_TEST_ERROR) GARBAGE += $(addsuffix .log,$(MOCHITESTS) reftest crashtest jstestbrowser)