Commit 7c11686b authored by John Budorick's avatar John Budorick Committed by Commit Bot

Use denylist in //android_webview/tools scripts.

Bug: 1097306
Change-Id: I9c23dae3e78aa6d975692c0d8ce98b549a7e7756
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2396621Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805768}
parent 0500bd4e
...@@ -310,8 +310,8 @@ def ForwardArgsToTestRunner(known_args): ...@@ -310,8 +310,8 @@ def ForwardArgsToTestRunner(known_args):
if known_args.devices: if known_args.devices:
# test_runner.py parses --device as nargs instead of append args # test_runner.py parses --device as nargs instead of append args
forwarded_args.extend(['--device'] + known_args.devices) forwarded_args.extend(['--device'] + known_args.devices)
if known_args.blacklist_file: if known_args.denylist_file:
forwarded_args.extend(['--blacklist-file', known_args.blacklist_file]) forwarded_args.extend(['--denylist-file', known_args.denylist_file])
if known_args.verbose: if known_args.verbose:
forwarded_args.extend(['-' + 'v' * known_args.verbose]) forwarded_args.extend(['-' + 'v' * known_args.verbose])
...@@ -332,7 +332,7 @@ def GetDevice(args): ...@@ -332,7 +332,7 @@ def GetDevice(args):
emulator_instance.Start(writable_system=True) emulator_instance.Start(writable_system=True)
device_utils.DeviceUtils(emulator_instance.serial).WaitUntilFullyBooted() device_utils.DeviceUtils(emulator_instance.serial).WaitUntilFullyBooted()
devices = script_common.GetDevices(args.devices, args.blacklist_file) devices = script_common.GetDevices(args.devices, args.denylist_file)
device = devices[0] device = devices[0]
if len(devices) > 1: if len(devices) > 1:
logging.warning('Detection of arch and cts-release will use 1st of %d ' logging.warning('Detection of arch and cts-release will use 1st of %d '
......
...@@ -321,7 +321,7 @@ def main(raw_args): ...@@ -321,7 +321,7 @@ def main(raw_args):
logging_common.InitializeLogging(args) logging_common.InitializeLogging(args)
devil_chromium.Initialize(adb_path=args.adb_path) devil_chromium.Initialize(adb_path=args.adb_path)
devices = script_common.GetDevices(args.devices, args.blacklist_file) devices = script_common.GetDevices(args.devices, args.denylist_file)
device = devices[0] device = devices[0]
if len(devices) > 1: if len(devices) > 1:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment