Bug 1026290 - Do not filter logFile parameter from testConfig.js; r=chmanchester
☠☠ backed out by 8663be2ce7cf ☠ ☠
authorGeoff Brown <gbrown@mozilla.com>
Tue, 25 Nov 2014 17:31:44 -0700
changeset 241849 bde6ca1bff09673057e4f1197bf05f68ec3ebc28
parent 241848 f03b99824f5430f98fc874677e5e772c280ab837
child 241850 272443dba5380be871fc5a295cf823b398d7712f
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
@@ -2094,17 +2094,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):