Bug 1119534 - Consolidate log file names set by mozharness.;r=armenzg
--- a/scripts/android_emulator_unittest.py
+++ b/scripts/android_emulator_unittest.py
@@ -397,32 +397,34 @@ class AndroidEmulatorTest(BlobUploadMixi
self.query_python_path('python'),
'-u',
os.path.join(
dirs["abs_%s_dir" % suite_category],
self.tree_config["suite_definitions"][suite_category]["run_filename"]
),
]
+ raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
+ '%s_raw.log' % suite_name)
str_format_values = {
'app': self._query_package_name(),
'remote_webserver': c['remote_webserver'],
'xre_path': os.path.join(dirs['abs_xre_dir'], 'xre'),
'utility_path': os.path.join(dirs['abs_xre_dir'], 'bin'),
'device_ip': c['device_ip'],
'device_port': str(emulator['sut_port1']),
'http_port': emulator['http_port'],
'ssl_port': emulator['ssl_port'],
'certs_path': os.path.join(dirs['abs_work_dir'], 'tests/certs'),
# TestingMixin._download_and_extract_symbols() will set
# 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': os.path.join(dirs['abs_blob_upload_dir'], 'raw_structured_logs.log')
+ 'raw_log_file': raw_log_file,
}
for option in self.tree_config["suite_definitions"][suite_category]["options"]:
cmd.extend([option % str_format_values])
for arg in self.test_suite_definitions[suite_name]["extra_args"]:
argname = arg.split('=')[0]
# only add the extra arg if it wasn't already defined by in-tree configs
if any(a.split('=')[0] == argname for a in cmd):
--- a/scripts/android_panda.py
+++ b/scripts/android_panda.py
@@ -217,17 +217,17 @@ class PandaTest(TestingMixin, MercurialS
if preflight_run_method:
preflight_run_method(suites)
if suites:
self.info('#### Running %s suites' % suite_category)
for suite in suites:
dirs = self.query_abs_dirs()
self._download_unzip_hostutils()
- abs_base_cmd = self._query_abs_base_cmd(suite_category)
+ abs_base_cmd = self._query_abs_base_cmd(suite_category, suite)
should_install_app = True
if 'cppunittest' in suite:
should_install_app = False
# check if separate test package required
if not os.path.isdir(dirs['abs_cppunittest_dir']):
self._download_unzip(self.test_url.replace('tests', 'tests.cppunit'), dirs['abs_test_install_dir'])
@@ -415,17 +415,17 @@ class PandaTest(TestingMixin, MercurialS
return self.abs_dirs
def _query_symbols_url(self):
"""query the full symbols URL based upon binary URL"""
# may break with name convention changes but is one less 'input' for script
if self.symbols_url:
return self.symbols_url
- def _query_abs_base_cmd(self, suite_category):
+ def _query_abs_base_cmd(self, suite_category, suite):
#check for apk first with if ?
c = self.config
dirs = self.query_abs_dirs()
options = []
run_file = c['run_file_names'][suite_category]
base_cmd = ['python', '-u']
base_cmd.append(os.path.join((dirs["abs_%s_dir" % suite_category]), run_file))
self.device_ip = socket.gethostbyname(self.mozpool_device)
@@ -444,26 +444,28 @@ class PandaTest(TestingMixin, MercurialS
apk_dir = self.abs_dirs['abs_work_dir']
self.apk_path = os.path.join(apk_dir, self.filename_apk)
unzip = self.query_exe("unzip")
package_path = os.path.join(apk_dir, 'package-name.txt')
unzip_cmd = [unzip, '-q', '-o', self.apk_path]
self.run_command(unzip_cmd, cwd=apk_dir, halt_on_failure=True, fatal_exit_code=3)
self.app_name = str(self.read_from_file(package_path, verbose=True)).rstrip()
+ raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
+ '%s_raw.log' % suite)
str_format_values = {
'device_ip': self.device_ip,
'hostname': self.mozpool_device,
'symbols_path': self._query_symbols_url(),
'http_port': http_port,
'ssl_port': ssl_port,
'app_name': self.app_name,
'apk_name': self.filename_apk,
'apk_path': self.apk_path,
- 'raw_log_file': os.path.join(dirs['abs_blob_upload_dir'], 'raw_structured_logs.log')
+ 'raw_log_file': raw_log_file,
}
if '%s_options' % suite_category in self.tree_config:
for option in self.tree_config['%s_options' % suite_category]:
options.append(option % str_format_values)
abs_base_cmd = base_cmd + options
return abs_base_cmd
elif "suite_definitions" in self.tree_config and \
suite_category in self.tree_config["suite_definitions"]: # new in-tree format
--- a/scripts/b2g_desktop_unittest.py
+++ b/scripts/b2g_desktop_unittest.py
@@ -146,27 +146,29 @@ class B2GDesktopTest(BlobUploadMixin, Te
self.register_virtualenv_module(requirements=[requirements],
two_pass=True)
def _query_abs_base_cmd(self, suite):
dirs = self.query_abs_dirs()
cmd = [self.query_python_path('python')]
cmd.append(self.query_value("run_file_names")[suite])
+ raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
+ '%s_raw.log' % suite)
str_format_values = {
'application': self.binary_path,
'test_manifest': self.test_manifest,
'symbols_path': self.symbols_path,
'gaia_profile': self.gaia_profile,
'utility_path': os.path.join(dirs['abs_tests_dir'], 'bin'),
'total_chunks': self.config.get('total_chunks'),
'this_chunk': self.config.get('this_chunk'),
'cert_path': dirs['abs_certs_dir'],
'browser_arg': self.config.get('browser_arg'),
- 'raw_log_file': os.path.join(dirs['abs_blob_upload_dir'], 'raw_structured_logs.log')
+ 'raw_log_file': raw_log_file,
}
# Bug 978233 - hack to get around multiple mochitest manifest arguments
if suite == 'mochitest':
if os.path.isfile(os.path.join(dirs['abs_mochitest_dir'], self.test_manifest)):
if self.test_manifest.endswith('.ini'):
manifest_param = '--manifest'
else:
--- a/scripts/b2g_emulator_unittest.py
+++ b/scripts/b2g_emulator_unittest.py
@@ -256,16 +256,18 @@ class B2GEmulatorTest(TestingMixin, Tool
self.register_virtualenv_module(
'marionette', url=os.path.join('tests', 'marionette'))
def _query_abs_base_cmd(self, suite):
dirs = self.query_abs_dirs()
cmd = [self.query_python_path('python')]
cmd.append(self.config['run_file_names'][suite])
+ raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
+ '%s_raw.log' % suite)
str_format_values = {
'adbpath': self.adb_path,
'b2gpath': dirs['abs_b2g-distro_dir'],
'emulator': self.config['emulator'],
'logcat_dir': dirs['abs_work_dir'],
'modules_dir': dirs['abs_modules_dir'],
'remote_webserver': self.config['remote_webserver'],
'xre_path': os.path.join(dirs['abs_xre_dir'], 'bin'),
@@ -273,17 +275,17 @@ class B2GEmulatorTest(TestingMixin, Tool
# Remove it when Gecko 35 is no longer in tbpl.
'test_manifest': self.test_manifest,
'symbols_path': self.symbols_path,
'busybox': self.busybox_path,
'total_chunks': self.config.get('total_chunks'),
'this_chunk': self.config.get('this_chunk'),
'test_path': self.config.get('test_path'),
'certificate_path': dirs['abs_certs_dir'],
- 'raw_log_file': os.path.join(dirs['abs_blob_upload_dir'], 'raw_structured_logs.log')
+ 'raw_log_file': raw_log_file,
}
# Bug 978233 - hack to get around multiple mochitest manifest arguments
if suite == 'mochitest':
if os.path.isfile(os.path.join(dirs['abs_mochitest_dir'], self.test_manifest)):
if self.test_manifest.endswith('.ini'):
manifest_param = '--manifest'
else:
--- a/scripts/marionette.py
+++ b/scripts/marionette.py
@@ -371,31 +371,32 @@ class MarionetteTest(TestingMixin, Toolt
self._read_tree_config()
def run_marionette(self):
"""
Run the Marionette tests
"""
dirs = self.query_abs_dirs()
+ raw_log_file = os.path.join(dirs['abs_blob_upload_dir'],
+ 'marionette_raw.log')
config_fmt_args = {
'type': self.config.get('test_type'),
# emulator builds require a longer timeout
'timeout': 60000 if self.config.get('emulator') else 10000,
'profile': os.path.join(dirs['abs_gaia_dir'], 'profile'),
'xml_output': os.path.join(dirs['abs_work_dir'], 'output.xml'),
'html_output': os.path.join(dirs['abs_blob_upload_dir'], 'output.html'),
'logcat_dir': dirs['abs_work_dir'],
'emulator': self.config.get('emulator'),
'symbols_path': self.symbols_path,
'homedir': os.path.join(dirs['abs_emulator_dir'], 'b2g-distro'),
'binary': self.binary_path,
'address': self.config.get('marionette_address'),
- 'raw_log_file': os.path.join(dirs["abs_blob_upload_dir"],
- "mn_structured_full.log"),
+ 'raw_log_file': raw_log_file,
'gecko_log': dirs["abs_blob_upload_dir"],
}
# build the marionette command arguments
python = self.query_python_path('python')
if self.config.get('gaiatest'):
# make the gaia profile
--- a/scripts/web_platform_tests.py
+++ b/scripts/web_platform_tests.py
@@ -116,17 +116,17 @@ class WebPlatformTest(TestingMixin, Merc
# Make sure that the logging directory exists
if self.mkdir_p(dirs["abs_blob_upload_dir"]) == -1:
self.fatal("Could not create blobber upload directory")
# Exit
base_cmd += ["--log-raw=-",
"--log-raw=%s" % os.path.join(dirs["abs_blob_upload_dir"],
- "wpt_structured_full.log"),
+ "wpt_raw.log"),
"--binary=%s" % self.binary_path,
"--symbols-path=%s" % self.query_symbols_url(),
"--stackwalk-binary=%s" % self.query_minidump_stackwalk()]
for test_type in c.get("test_type", []):
base_cmd.append("--test-type=%s" % test_type)
for opt in ["total_chunks", "this_chunk"]: