diff options
Diffstat (limited to 'chromium/build/chromeos/test_runner.py')
| -rwxr-xr-x | chromium/build/chromeos/test_runner.py | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/chromium/build/chromeos/test_runner.py b/chromium/build/chromeos/test_runner.py index a5774274a48..4c384b73365 100755 --- a/chromium/build/chromeos/test_runner.py +++ b/chromium/build/chromeos/test_runner.py @@ -55,7 +55,6 @@ SYSTEM_LOG_LOCATIONS = [ # `journalctl -D ...`. '/var/log/journal/', '/var/log/messages', - '/var/log/power_manager/', '/var/log/ui/', ] @@ -117,7 +116,12 @@ class RemoteTest(object): if args.logs_dir: for log in SYSTEM_LOG_LOCATIONS: self._test_cmd += ['--results-src', log] - self._test_cmd += ['--results-dest-dir', args.logs_dir] + self._test_cmd += [ + '--results-dest-dir', + os.path.join(args.logs_dir, 'system_logs') + ] + if args.flash: + self._test_cmd += ['--flash'] # This environment variable is set for tests that have been instrumented # for code coverage. Its incoming value is expected to be a location @@ -722,7 +726,10 @@ def host_cmd(args, unknown_args): if args.logs_dir: for log in SYSTEM_LOG_LOCATIONS: cros_run_test_cmd += ['--results-src', log] - cros_run_test_cmd += ['--results-dest-dir', args.logs_dir] + cros_run_test_cmd += [ + '--results-dest-dir', + os.path.join(args.logs_dir, 'system_logs') + ] test_env = setup_env() if args.deploy_chrome: @@ -801,6 +808,11 @@ def add_common_args(*parsers): dest='logs_dir', help='Will copy everything under /var/log/ from the device after the ' 'test into the specified dir.') + parser.add_argument( + '--flash', + action='store_true', + help='Will flash the device to the current SDK version before running ' + 'the test.') vm_or_device_group = parser.add_mutually_exclusive_group() vm_or_device_group.add_argument( |