Bug 1454671 - Combine default log and gecko.log in automation on Android.
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
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -248,17 +248,17 @@ config = {
"testsdir": "marionette",
"options": [
"--emulator",
"--app=fennec",
"--package=%(app)s",
"--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",
"--startup-timeout=300",
],
},
"geckoview": {
"run_filename": "rungeckoview.py",
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -436,17 +436,16 @@ class AndroidEmulatorTest(TestingMixin,
# self.symbols_path when downloading/extracting.
'symbols_path': self.symbols_path,
'modules_dir': dirs['abs_modules_dir'],
'installer_path': self.installer_path,
'raw_log_file': raw_log_file,
'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', '')
),
}
user_paths = os.environ.get('MOZHARNESS_TEST_PATHS')
for option in self.config["suite_definitions"][self.test_suite]["options"]: