Bug 1026290: Do not filter logFile parameter from testConfig.js; r=chmanchester
authorGeoff Brown <gbrown@mozilla.com>
Wed, 26 Nov 2014 16:51:13 -0700
changeset 242120 e8f0e9303339bb7fbbe21f503845bf169deb7e21
parent 242119 6062040e81e6062f2524b9eaea8710be7599ac4c
child 242121 0e0d89a0d4147ab6355cfd7a799ddf37de84b50a
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1026290
milestone36.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 1026290: Do not filter logFile parameter from testConfig.js; r=chmanchester
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2097,17 +2097,19 @@ class Mochitest(MochitestUtilsMixin):
   def makeTestConfig(self, options):
     "Creates a test configuration file for customizing test execution."
     options.logFile = options.logFile.replace("\\", "\\\\")
     options.testPath = options.testPath.replace("\\", "\\\\")
 
     if "MOZ_HIDE_RESULTS_TABLE" in os.environ and os.environ["MOZ_HIDE_RESULTS_TABLE"] == "1":
       options.hideResultsTable = True
 
-    d = dict((k, v) for k, v in options.__dict__.iteritems() if not k.startswith('log'))
+    d = dict((k, v) for k, v in options.__dict__.items() if
+        (not k.startswith('log_') or
+         not any([k.endswith(fmt) for fmt in commandline.log_formatters.keys()])))
     d['testRoot'] = self.testRoot
     content = json.dumps(d)
 
     with open(os.path.join(options.profilePath, "testConfig.js"), "w") as config:
       config.write(content)
 
   def getTestManifest(self, options):
     if isinstance(options.manifestFile, TestManifest):