commit f76cfea47677dbed4d3dfa93e1f1e3c22d8640de Author: Ryan VanderMeulen ryanvm@gmail.com Date: Thu Jul 17 13:32:11 2014 -0400

Bug 1035551 - Remove the new logging information that doesn't apply to non-trunk branches. a=NPOTB --- testing/config/mozharness/marionette.py | 5 ----- 1 file changed, 5 deletions(-)

diff --git a/testing/config/mozharness/marionette.py b/testing/config/mozharness/marionette.py index 6794bbc..f0cee5b 100644 --- a/testing/config/mozharness/marionette.py +++ b/testing/config/mozharness/marionette.py @@ -5,20 +5,17 @@ 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", @@ -36,7 +33,6 @@ config = { "--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", @@ -50,7 +46,6 @@ config = { "--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", ],