From 85902481008f3c1ee3054957ecfa83944f9973dd Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 17 Mar 2016 17:17:10 -0400
Subject: [PATCH] Bug 1256984 - Indicate whether tests ran in e10s mode in the
 mochitest-* summary; r=mconley

---
 testing/mochitest/browser-test.js                | 2 ++
 testing/mochitest/runtests.py                    | 6 +++++-
 testing/mochitest/tests/SimpleTest/TestRunner.js | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
index cfc04f895645..df347f7c0c60 100644
--- a/testing/mochitest/browser-test.js
+++ b/testing/mochitest/browser-test.js
@@ -382,10 +382,12 @@ Tester.prototype = {
       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",
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index def6da008078..1d72027982eb 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2175,6 +2175,8 @@ class MochitestDesktop(MochitestBase):
             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"
@@ -2182,13 +2184,15 @@ class MochitestDesktop(MochitestBase):
             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
 
diff --git a/testing/mochitest/tests/SimpleTest/TestRunner.js b/testing/mochitest/tests/SimpleTest/TestRunner.js
index dd88bd1c50f3..fd599eab4e95 100644
--- a/testing/mochitest/tests/SimpleTest/TestRunner.js
+++ b/testing/mochitest/tests/SimpleTest/TestRunner.js
@@ -449,10 +449,13 @@ TestRunner.runNextTest = function() {
 
         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