From 70287b8bfbb2db0099d49b39898fc5c19b4f4a3c Mon Sep 17 00:00:00 2001 From: Henrik Skupin Date: Tue, 17 Apr 2018 16:53:24 +0200 Subject: [PATCH] Bug 1454671 - Combine default log and gecko.log in automation on Android. r=ato To ease investigation of failures the gecko log should be streamed to stdout so it will be part of the default log. It helps with correlating tracing output with the appropriate test. MozReview-Commit-ID: JnH64bhhtgk --HG-- extra : rebase_source : b50707189c181a865ab66dac8b3cb4e258a8e427 --- testing/mozharness/configs/android/android_common.py | 2 +- testing/mozharness/scripts/android_emulator_unittest.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/testing/mozharness/configs/android/android_common.py b/testing/mozharness/configs/android/android_common.py index 8f80c4b08584..60899cc3c4ce 100644 --- a/testing/mozharness/configs/android/android_common.py +++ b/testing/mozharness/configs/android/android_common.py @@ -253,7 +253,7 @@ config = { "--address=%(address)s", "%(test_manifest)s", "--disable-e10s", - "--gecko-log=%(gecko_log)s", + "--gecko-log=-", "--log-raw=%(raw_log_file)s", "--log-errorsummary=%(error_summary_file)s", "--symbols-path=%(symbols_path)s", diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py index 278e073e5ebc..02a64d5d6600 100644 --- a/testing/mozharness/scripts/android_emulator_unittest.py +++ b/testing/mozharness/scripts/android_emulator_unittest.py @@ -441,7 +441,6 @@ class AndroidEmulatorTest(TestingMixin, EmulatorMixin, BaseScript, MozbaseMixin) 'error_summary_file': error_summary_file, # marionette options 'address': c.get('marionette_address'), - 'gecko_log': os.path.join(dirs["abs_blob_upload_dir"], 'gecko.log'), 'test_manifest': os.path.join( dirs['abs_marionette_tests_dir'], self.config.get('marionette_test_manifest', '')