Bug 969437 - part 1 - introduce a --quiet option for mochitests; r=jmaher

testing/mochitest/mach_commands.py

@@ -190,7 +190,7 @@ class MochitestRunner(MozbuildObject):
         jsdebugger=False, debug_on_failure=False, start_at=None, end_at=None,
         e10s=False, dmd=False, dump_output_directory=None,
         dump_about_memory_after_test=False, dump_dmd_after_test=False,
-        install_extension=None, **kwargs):
+        install_extension=None, quiet=False, **kwargs):
         """Runs a mochitest.
 
         test_paths are path to tests. They can be a relative path from the
@@ -308,6 +308,7 @@ class MochitestRunner(MozbuildObject):
         options.dumpAboutMemoryAfterTest = dump_about_memory_after_test
         options.dumpDMDAfterTest = dump_dmd_after_test
         options.dumpOutputDirectory = dump_output_directory
+        options.quiet = quiet
 
         options.failureFile = failure_file_path
         if install_extension != None:
@@ -501,6 +502,10 @@ def MochitestCommand(func):
             'Parameter is a path to xpi file.')
     func = install_extension(func)
 
+    quiet = CommandArgument('--quiet', default=False, action='store_true',
+        help='Do not print test log lines unless a failure occurs.')
+    func = quiet(func)
+
     return func
 
 def B2GCommand(func):

testing/mochitest/mochitest_options.py

@@ -391,6 +391,12 @@ class MochitestOptions(optparse.OptionParser):
                    "when not set, recoverable but misleading SIGSEGV instances "
                    "may occur in Ion/Odin JIT code."
         }],
+        [["--quiet"],
+         { "action": "store_true",
+           "default": False,
+           "dest": "quiet",
+           "help": "Do not print test log lines unless a failure occurs."
+         }],
     ]
 
     def __init__(self, **kwargs):

testing/mochitest/runtests.py

@@ -361,6 +361,8 @@ class MochitestUtilsMixin(object):
         self.urlOpts.append("dumpAboutMemoryAfterTest=true")
       if options.dumpDMDAfterTest:
         self.urlOpts.append("dumpDMDAfterTest=true")
+      if options.quiet:
+        self.urlOpts.append("quiet=true")
 
   def getTestFlavor(self, options):
     if options.browserChrome:

testing/mochitest/tests/SimpleTest/SimpleTest.js

@@ -313,7 +313,7 @@ SimpleTest._getCurrentTestURL = function() {
            "unknown test url";
 };
 
-SimpleTest._forceLogMessageOutput = false;
+SimpleTest._forceLogMessageOutput = parentRunner && !parentRunner.quiet;
 
 /**
  * Force all test messages to be displayed.  Only applies for the current test.

testing/mochitest/tests/SimpleTest/TestRunner.js

@@ -91,6 +91,7 @@ TestRunner.runSlower = false;
 TestRunner.dumpOutputDirectory = "";
 TestRunner.dumpAboutMemoryAfterTest = false;
 TestRunner.dumpDMDAfterTest = false;
+TestRunner.quiet = false;
 TestRunner.slowestTestTime = 0;
 TestRunner.slowestTestURL = "";
 

testing/mochitest/tests/SimpleTest/setup.js

@@ -135,6 +135,10 @@ if (params.dumpDMDAfterTest) {
   TestRunner.dumpDMDAfterTest = true;
 }
 
+if (params.quiet) {
+  TestRunner.quiet = true;
+}
+
 // Log things to the console if appropriate.
 TestRunner.logger.addListener("dumpListener", consoleLevel + "", function(msg) {
   dump(msg.num + " " + msg.level + " " + msg.info.join(' ') + "\n");