Bug 979936 - delete unused `quiet' param-handling code in setup.js; r=jmaher
authorNathan Froyd <froydnj@mozilla.com>
Wed, 05 Mar 2014 12:39:46 -0500
changeset 191003 334db4ff0617eb8cdb682d7b807aacd423f565f7
parent 191002 f84cf36472d3265c221fb75c756364552856a568
child 191004 c14f13b558aa5e87dd06599b66f69c0bfde6fb2d
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs979936
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 979936 - delete unused `quiet' param-handling code in setup.js; r=jmaher
testing/mochitest/tests/SimpleTest/setup.js
--- a/testing/mochitest/tests/SimpleTest/setup.js
+++ b/testing/mochitest/tests/SimpleTest/setup.js
@@ -1,9 +1,9 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- js-indent-level: 2; tab-width: 2; indent-tabs-mode: nil -*- */
 /* vim:set ts=2 sw=2 sts=2 et: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 TestRunner.logEnabled = true;
 TestRunner.logger = LogController;
 
@@ -113,24 +113,16 @@ if (params.debugOnFailure) {
 }
 
 // logFile to write our results
 if (params.logFile) {
   var spl = new SpecialPowersLogger(params.logFile);
   TestRunner.logger.addListener("mozLogger", fileLevel + "", spl.getLogCallback());
 }
 
-// if we get a quiet param, don't log to the console
-if (!params.quiet) {
-  function dumpListener(msg) {
-    dump(msg.num + " " + msg.level + " " + msg.info.join(' ') + "\n");
-  }
-  TestRunner.logger.addListener("dumpListener", consoleLevel + "", dumpListener);
-}
-
 // A temporary hack for android 4.0 where Fennec utilizes the pandaboard so much it reboots
 if (params.runSlower) {
   TestRunner.runSlower = true;
 }
 
 if (params.dumpOutputDirectory) {
   TestRunner.dumpOutputDirectory = params.dumpOutputDirectory;
 }
@@ -138,16 +130,21 @@ if (params.dumpOutputDirectory) {
 if (params.dumpAboutMemoryAfterTest) {
   TestRunner.dumpAboutMemoryAfterTest = true;
 }
 
 if (params.dumpDMDAfterTest) {
   TestRunner.dumpDMDAfterTest = true;
 }
 
+// Log things to the console if appropriate.
+TestRunner.logger.addListener("dumpListener", consoleLevel + "", function(msg) {
+  dump(msg.num + " " + msg.level + " " + msg.info.join(' ') + "\n");
+});
+
 var gTestList = [];
 var RunSet = {}
 RunSet.runall = function(e) {
   // Filter tests to include|exclude tests based on data in params.filter.
   // This allows for including or excluding tests from the gTestList
   if (params.testManifest) {
     getTestManifest("http://mochi.test:8888/" + params.testManifest, params, function(filter) { gTestList = filterTests(filter, gTestList, params.runOnly); RunSet.runtests(); });
   } else {