Bug 1256984 - Indicate whether tests ran in e10s mode in the mochitest-* summary; r=mconley
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 17 Mar 2016 17:17:10 -0400
changeset 289463 eafefe59f7011f9c00ceb55a9c3347127e4ece3a
parent 289462 a4f292dc6515d548b36b2ded8efdf1b748fca0b4
child 289464 a6dca9d0ecdd537f5f0bed34fcb557d787f72f22
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1256984
milestone48.0a1
Bug 1256984 - Indicate whether tests ran in e10s mode in the mochitest-* summary; r=mconley
testing/mochitest/browser-test.js
testing/mochitest/runtests.py
testing/mochitest/tests/SimpleTest/TestRunner.js
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -377,20 +377,22 @@ Tester.prototype = {
 
       // In the main process, we print the ShutdownLeaksCollector message here.
       let pid = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime).processID;
       dump("Completed ShutdownLeaks collections in process " + pid + "\n");
 
       this.structuredLogger.info("TEST-START | Shutdown");
 
       if (this.tests.length) {
+        let e10sMode = gMultiProcessBrowser ? "e10s" : "non-e10s";
         this.structuredLogger.info("Browser Chrome Test Summary");
         this.structuredLogger.info("Passed:  " + passCount);
         this.structuredLogger.info("Failed:  " + failCount);
         this.structuredLogger.info("Todo:    " + todoCount);
+        this.structuredLogger.info("Mode:    " + e10sMode);
       } else {
         this.structuredLogger.testEnd("browser-test.js",
                                       "FAIL",
                                       "PASS",
                                       "No tests to run. Did you pass invalid test_paths?");
       }
       this.structuredLogger.info("*** End BrowserChrome Test Results ***");
 
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2170,30 +2170,34 @@ class MochitestDesktop(MochitestBase):
             result = self.runMochitests(options, tests_in_dir)
 
             # Dump the logging buffer
             self.message_logger.dump_buffered()
 
             if result == -1:
                 break
 
+        e10s_mode = "e10s" if options.e10s else "non-e10s"
+
         # printing total number of tests
         if options.browserChrome:
             print "TEST-INFO | checking window state"
             print "Browser Chrome Test Summary"
             print "\tPassed: %s" % self.countpass
             print "\tFailed: %s" % self.countfail
             print "\tTodo: %s" % self.counttodo
+            print "\tMode: %s" % e10s_mode
             print "*** End BrowserChrome Test Results ***"
         else:
             print "0 INFO TEST-START | Shutdown"
             print "1 INFO Passed:  %s" % self.countpass
             print "2 INFO Failed:  %s" % self.countfail
             print "3 INFO Todo:    %s" % self.counttodo
-            print "4 INFO SimpleTest FINISHED"
+            print "4 INFO Mode:    %s" % e10s_mode
+            print "5 INFO SimpleTest FINISHED"
 
         return result
 
     def doTests(self, options, testsToFilter=None):
         # A call to initializeLooping method is required in case of --run-by-dir or --bisect-chunk
         # since we need to initialize variables for each loop.
         if options.bisectChunk or options.runByDir:
             self.initializeLooping(options)
--- a/testing/mochitest/tests/SimpleTest/TestRunner.js
+++ b/testing/mochitest/tests/SimpleTest/TestRunner.js
@@ -444,20 +444,23 @@ TestRunner.runNextTest = function() {
             // ... the indicator.
             var indicator = $("indicator");
             indicator.innerHTML = "Status: Fail (No checks actually run)";
             indicator.style.backgroundColor = "red";
         }
 
         SpecialPowers.unregisterProcessCrashObservers();
 
+        let e10sMode = SpecialPowers.isMainProcess() ? "non-e10s" : "e10s";
+
         TestRunner.structuredLogger.info("TEST-START | Shutdown");
         TestRunner.structuredLogger.info("Passed:  " + passCount);
         TestRunner.structuredLogger.info("Failed:  " + failCount);
         TestRunner.structuredLogger.info("Todo:    " + todoCount);
+        TestRunner.structuredLogger.info("Mode:    " + e10sMode);
         TestRunner.structuredLogger.info("Slowest: " + TestRunner.slowestTestTime + 'ms - ' + TestRunner.slowestTestURL);
 
         // If we are looping, don't send this cause it closes the log file
         if (TestRunner.repeat === 0) {
           TestRunner.structuredLogger.info("SimpleTest FINISHED");
         }
 
         if (TestRunner.repeat === 0 && TestRunner.onComplete) {