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 171602 a7dd18f55543750035760e8bd99cc7f592b48dad
parent 171601 88fc67bb7d2b12de83fc9460e0d91a000d175fcd
child 171603 9d5426c9867840fb87fc21a6f016dab6763e1020
push id583
push userryanvm@gmail.com
push dateThu, 17 Jul 2014 17:36:27 +0000
reviewersNPOTB
bugs1035551
milestone28.0
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",
     ],
 }