Bug 969633 - xpcshell reruns "tests that failed when run in parallel" when only a single test was executed, r=gps
authorMarco Bonardo <mbonardo@mozilla.com>
Tue, 07 Oct 2014 16:30:30 +0200
changeset 209397 88664bb1a031cd2667526f75227855c003630bd9
parent 209396 9a8420032ae533749cef7a720695bc3197aa2712
child 209398 116b905fd60500e1a7bb829651ac02e460009e60
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersgps
bugs969633
milestone35.0a1
Bug 969633 - xpcshell reruns "tests that failed when run in parallel" when only a single test was executed, r=gps
testing/xpcshell/mach_commands.py
--- a/testing/xpcshell/mach_commands.py
+++ b/testing/xpcshell/mach_commands.py
@@ -137,19 +137,20 @@ class XPCShellRunner(MozbuildObject):
 
         xpcshell_filter = TestStartFilter()
         self.log_manager.terminal_handler.addFilter(xpcshell_filter)
 
         tests_dir = os.path.join(self.topobjdir, '_tests', 'xpcshell')
         modules_dir = os.path.join(self.topobjdir, '_tests', 'modules')
         # We want output from the test to be written immediately if we are only
         # running a single test.
-        verbose_output = (test_path is not None or
-                          (manifest and len(manifest.test_paths())==1) or
-                          verbose)
+        single_test = (test_path is not None or
+                       (manifest and len(manifest.test_paths())==1))
+        verbose_output = verbose or single_test
+        sequential = sequential or single_test
 
         args = {
             'manifest': manifest,
             'xpcshell': self.get_binary_path('xpcshell'),
             'mozInfo': os.path.join(self.topobjdir, 'mozinfo.json'),
             'symbolsPath': os.path.join(self.distdir, 'crashreporter-symbols'),
             'interactive': interactive,
             'keepGoing': keep_going,