Bug 491784 - runxpcshelltests.py should generate a count summary, as reftest and mochitest do; (Bv1-CC) followup fix for bug 485736
authorSerge Gautherie <sgautherie.bz@free.fr>
Fri, 28 Aug 2009 17:28:27 +0200
changeset 3445 b12740c6606a7e6cf1cd428fd709c721035a9ec8
parent 3444 dc30a01aa4fc5293e40586db93b497ce490e115d
child 3446 a39d775470fc2a7cc23781da055bb6dded10e575
push idunknown
push userunknown
push dateunknown
bugs491784, 485736
Bug 491784 - runxpcshelltests.py should generate a count summary, as reftest and mochitest do; (Bv1-CC) followup fix for bug 485736 r=kairo
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -150,43 +150,43 @@ libs::
 
 testxpcsrcdir = $(MOZILLA_SRCDIR)/testing/xpcshell
 
 # Execute all tests in the $(XPCSHELL_TESTS) directories.
 # See also mozilla/testsuite-targets.mk 'xpcshell-tests' target for global execution.
 xpcshell-tests:
 	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
 	  -I$(topsrcdir)/mozilla/build \
-          $(testxpcsrcdir)/runxpcshelltests.py \
+	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
-          $(DIST)/bin/xpcshell \
-          $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
+	  $(DIST)/bin/xpcshell \
+	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
 # Execute a single test, specified in $(SOLO_FILE), but don't automatically
 # start the test. Instead, present the xpcshell prompt so the user can
 # attach a debugger and then start the test.
 check-interactive:
 	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
 	  -I$(topsrcdir)/mozilla/build \
-          $(testxpcsrcdir)/runxpcshelltests.py \
+	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
-          --test=$(SOLO_FILE) \
-          --interactive \
-          $(DIST)/bin/xpcshell \
-          $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
+	  --test-path=$(SOLO_FILE) \
+	  --interactive \
+	  $(DIST)/bin/xpcshell \
+	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
 # Execute a single test, specified in $(SOLO_FILE)
 check-one:
 	$(PYTHON) -u $(topsrcdir)/mozilla/config/pythonpath.py \
 	  -I$(topsrcdir)/mozilla/build \
-          $(testxpcsrcdir)/runxpcshelltests.py \
+	  $(testxpcsrcdir)/runxpcshelltests.py \
 	  --symbols-path=$(DIST)/crashreporter-symbols \
-          --test=$(SOLO_FILE) \
-          $(DIST)/bin/xpcshell \
-          $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
+	  --test-path=$(SOLO_FILE) \
+	  $(DIST)/bin/xpcshell \
+	  $(foreach dir,$(XPCSHELL_TESTS),$(testxpcobjdir)/$(MODULE)/$(dir))
 
 endif # XPCSHELL_TESTS
 
 ifdef CPP_UNIT_TESTS
 
 # Compile the tests to $(DIST)/bin.  Make lots of niceties available by default
 # through TestHarness.h, by modifying the list of includes and the libs against
 # which stuff links.
@@ -285,16 +285,17 @@ ifdef FORCE_SHARED_LIB
 ifndef FORCE_STATIC_LIB
 LIBRARY			:= $(NULL)
 endif
 endif
 
 ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
 ifndef GNU_CC
 
+#
 # Unless we're building SIMPLE_PROGRAMS, all C++ files share a PDB file per
 # directory. For parallel builds, this PDB file is shared and locked by
 # MSPDBSRV.EXE, starting with MSVC8 SP1. If you're using MSVC 7.1 or MSVC8
 # without SP1, don't do parallel builds.
 #
 # The final PDB for libraries and programs is created by the linker and uses
 # a different name from the single PDB file created by the compiler. See
 # bug 462740.