From 071f6ce94876012cdd8b39969b3812e1b767e120 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 25 Feb 2014 16:41:02 -0500
Subject: [PATCH] Bug 974073 - add SimpleTest.forceCompleteLog() so tests can
 force all test output to be displayed; r=jmaher

---
 .../mochitest/tests/SimpleTest/SimpleTest.js   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/testing/mochitest/tests/SimpleTest/SimpleTest.js b/testing/mochitest/tests/SimpleTest/SimpleTest.js
index dd838f5de35..7ebb048b302 100644
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -313,6 +313,21 @@ SimpleTest._getCurrentTestURL = function() {
            "unknown test url";
 };
 
+SimpleTest._forceLogMessageOutput = false;
+
+/**
+ * Force all test messages to be displayed.  Only applies for the current test.
+ */
+SimpleTest.requestCompleteLog = function() {
+    if (SimpleTest._forceLogMessageOutput)
+        return;
+
+    SimpleTest._forceLogMessageOutput = true;
+    SimpleTest.registerCleanupFunction(function() {
+        SimpleTest._forceLogMessageOutput = false;
+    });
+};
+
 SimpleTest._logResult = (function () {
     var numCoalescedMessages = 1;
     var coalesceThreshold = 100;
@@ -334,7 +349,8 @@ SimpleTest._logResult = (function () {
         var shouldLog = (isError ||
                          passString == "TEST-INFO" ||
                          outputCoalescedMessage ||
-                         runningSingleTest);
+                         runningSingleTest ||
+                         SimpleTest._forceLogMessageOutput);
 
         if (!shouldLog) {
             ++numCoalescedMessages;