debug-unittests
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 75 aa1b133fd1616ee46ee56e3d4cbeea19da6c6650
permissions -rw-r--r--
State as of now

* * *

diff --git a/config/config.mk b/config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -872,7 +872,7 @@ endif
 endif
 
 ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
-RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
+RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh $(DEBUG_TEST_PROGRAM)
 endif
 
 #
diff --git a/config/rules.mk b/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1815,7 +1815,7 @@ libs::
 	for testdir in $(XPCSHELL_TESTS); do \
 	  $(INSTALL) \
 	    $(srcdir)/$$testdir/*.js \
-	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
+	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/unit; \
 	done
 
 # Path formats on Windows are hard.  We require a topsrcdir formatted so that
@@ -1840,11 +1840,10 @@ endif # CYGWIN_WRAPPER
 
 # Test execution
 check::
-	@$(EXIT_ON_ERROR) \
+	$(EXIT_ON_ERROR) \
 	for testdir in $(XPCSHELL_TESTS); do \
-	  $(RUN_TEST_PROGRAM) \
 	    $(topsrcdir)/tools/test-harness/xpcshell-simple/test_all.sh \
-	      $(DIST)/bin/xpcshell \
+	      "$(RUN_TEST_PROGRAM) $(DIST)/bin/xpcshell" \
 	      $(FWDSLASH_TOPSRCDIR) \
 	      $(NATIVE_TOPSRCDIR) \
 	      $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir; \
@@ -1852,10 +1851,9 @@ check::
 
 # Test execution
 check-interactive::
-	@$(EXIT_ON_ERROR) \
-	$(RUN_TEST_PROGRAM) \
+	$(EXIT_ON_ERROR) \
 	  $(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
-	    $(DIST)/bin/xpcshell \
+	    "$(RUN_TEST_PROGRAM) $(DIST)/bin/xpcshell" \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
 	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \
@@ -1864,9 +1862,8 @@ check-interactive::
 # Test execution
 check-one::
 	@$(EXIT_ON_ERROR) \
-	$(RUN_TEST_PROGRAM) \
 	  $(topsrcdir)/tools/test-harness/xpcshell-simple/test_one.sh \
-	    $(DIST)/bin/xpcshell \
+	    "$(RUN_TEST_PROGRAM) $(DIST)/bin/xpcshell" \
 	    $(FWDSLASH_TOPSRCDIR) \
 	    $(NATIVE_TOPSRCDIR) \
 	    $(DEPTH)/_tests/xpcshell-simple/$(MODULE)/$$testdir \