Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB DONTBUILD
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 17 Jul 2014 13:32:11 -0400
changeset 200198 8879005f2bd606f3876a237c24a42088a5b54b30
parent 200197 acedd56e2e087313194c0aed7813add33f8fd3c9
child 200199 3a54de2c276ebe542389230712f20d4f3ba1d0a5
child 200201 f6f62a1aeab987d984f0cbf8e773e73e81e9e43c
child 200204 570388d71f9afbf905a4119c0c81cb22ce917b06
push id6
push userryanvm@gmail.com
push dateThu, 17 Jul 2014 17:34:52 +0000
treeherdermozilla-esr31@8879005f2bd6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersNPOTB
bugs1035551
milestone31.0esrpre
Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB DONTBUILD
testing/config/mozharness/marionette.py
--- a/testing/config/mozharness/marionette.py
+++ b/testing/config/mozharness/marionette.py
@@ -1,29 +1,26 @@
 # 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/.
 
 config = {
     "marionette_desktop_options": [
         "--type=%(type)s",
-        "--log-raw=%(raw_log_file)s",
         "--binary=%(binary)s",
         "--address=%(address)s",
     ],
     "marionette_emulator_options": [
         "--type=%(type)s",
-        "--log-raw=%(raw_log_file)s",
         "--logcat-dir=%(logcat_dir)s",
         "--emulator=%(emulator)s",
         "--homedir=%(homedir)s",
     ],
     "webapi_emulator_options": [
         "--type=%(type)s",
-        "--log-raw=%(raw_log_file)s",
         "--symbols-path=%(symbols_path)s",
         "--logcat-dir=%(logcat_dir)s",
         "--emulator=%(emulator)s",
         "--homedir=%(homedir)s",
     ],
     # This combination is not currently run.
     "webapi_desktop_options": [
     ],
@@ -31,27 +28,25 @@ config = {
         "--restart",
         "--timeout=%(timeout)s",
         "--type=%(type)s",
         "--testvars=%(testvars)s",
         "--profile=%(profile)s",
         "--symbols-path=%(symbols_path)s",
         "--xml-output=%(xml_output)s",
         "--html-output=%(html_output)s",
-        "--log-raw=%(raw_log_file)s",
         "--logcat-dir=%(logcat_dir)s",
         "--emulator=%(emulator)s",
         "--homedir=%(homedir)s",
     ],
     "gaiatest_desktop_options": [
         "--restart",
         "--timeout=%(timeout)s",
         "--type=%(type)s",
         "--testvars=%(testvars)s",
         "--profile=%(profile)s",
         "--symbols-path=%(symbols_path)s",
         "--xml-output=%(xml_output)s",
         "--html-output=%(html_output)s",
-        "--log-raw=%(raw_log_file)s",
         "--binary=%(binary)s",
         "--address=%(address)s",
     ],
 }