chromium/src
0
Fork 0
Code Activity

Rename arg name --time-out-ms for rwt

Browse Source 
Change this to --timeout-ms to align with other parameter names,
e.g. --exit-after-n-crashes-or-timeouts, --skip-timeouts,
--initialize-webgpu-adapter-at-startup-timeout-ms.

Bug: 1095123
Change-Id: I039c342249c7392ffdb850eebbbf63a51fe7cd8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3366217
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Weizhong Xia <weizhong@google.com>
Cr-Commit-Position: refs/heads/main@{#955755}
This commit is contained in:
Weizhong Xia
2022-01-05 17:13:35 +00:00
committed by Chromium LUCI CQ
parent 5d2d7f93df
commit 91b533621b
17 changed files with 46 additions and 46 deletions

4
BUILD.gn

@ -1201,7 +1201,7 @@ if (!is_ios) {
} else {
_common_web_test_args += [ "--release" ]
if (dcheck_always_on) {
_common_web_test_args += [ "--time-out-ms=12000" ]
_common_web_test_args += [ "--timeout-ms=12000" ]
}
}
@ -1403,7 +1403,7 @@ if (!is_ios) {
root_build_dir) + ")" ] + _common_web_test_args -
[ _common_web_test_args[0] ]
if (is_asan) {
args += [ "--time-out-ms=30000" ]
args += [ "--timeout-ms=30000" ]
}
args += [
"--webgpu-cts-expectations",

2
docs/testing/identifying_tests_that_depend_on_order.md

@ -68,7 +68,7 @@ content_shell instance for each test. Tests that fail when run in isolation but
pass when run as part of the full test suite represent some state that we're not
properly resetting between test runs or some state that we're not properly
setting when starting up content_shell. You might want to run with
`--time-out-ms=60000` to weed out tests that timeout due to waiting on
`--timeout-ms=60000` to weed out tests that timeout due to waiting on
content_shell startup time.
#### Diagnose especially flaky tests

2
docs/testing/web_tests.md

@ -510,7 +510,7 @@ machine?
* Do one of the following:
* Option A) Run from the `chromium/src` folder:
`third_party/blink/tools/run_web_tests.py --additional-driver-flag='--remote-debugging-port=9222' --additional-driver-flag='--debug-devtools' --time-out-ms=6000000`
`third_party/blink/tools/run_web_tests.py --additional-driver-flag='--remote-debugging-port=9222' --additional-driver-flag='--debug-devtools' --timeout-ms=6000000`
* Option B) If you need to debug an http/tests/inspector test, start httpd
as described above. Then, run content_shell:
`out/Default/content_shell --remote-debugging-port=9222 --additional-driver-flag='--debug-devtools' --run-web-tests http://127.0.0.1:8000/path/to/test.html`

2
docs/testing/web_tests_linux.md

@ -72,7 +72,7 @@ There are two ways:
`blink/web_tests`).
1. Or, run as normal but with the
`--additional-drt-flag=--renderer-startup-dialog
--additional-drt-flag=--no-timeout --time-out-ms=86400000` flags. The first
--additional-drt-flag=--no-timeout --timeout-ms=86400000` flags. The first
one makes content\_shell bring up a dialog before running, which then would
let you attach to the process via `gdb -p PID_OF_DUMPRENDERTREE`. The others
help avoid the test shell and DumpRenderTree timeouts during the debug

34
testing/buildbot/chromium.dawn.json

@ -226,7 +226,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--no-xvfb",
"--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
],
@ -480,7 +480,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--no-xvfb",
"--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
],
@ -734,7 +734,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--no-xvfb",
"--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
],
@ -988,7 +988,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--no-xvfb",
"--additional-driver-flag=--enable-features=UseSkiaRenderer,Vulkan"
],
@ -1261,7 +1261,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--platform=mac-mac11"
],
"isolate_name": "webgpu_blink_web_tests",
@ -1516,7 +1516,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--platform=mac-mac11"
],
"isolate_name": "webgpu_blink_web_tests",
@ -1861,7 +1861,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--platform=mac-mac11"
],
"isolate_name": "webgpu_blink_web_tests",
@ -2116,7 +2116,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--platform=mac-mac11"
],
"isolate_name": "webgpu_blink_web_tests",
@ -2337,7 +2337,7 @@
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu",
"--target=Release_x64",
"--time-out-ms=48000"
"--timeout-ms=48000"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@ -2589,7 +2589,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--target=Release_x64"
],
"isolate_name": "webgpu_blink_web_tests",
@ -2835,7 +2835,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--target=Release_x64"
],
"isolate_name": "webgpu_blink_web_tests",
@ -3081,7 +3081,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--target=Release_x64"
],
"isolate_name": "webgpu_blink_web_tests",
@ -3327,7 +3327,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000",
"--timeout-ms=30000",
"--target=Release_x64"
],
"isolate_name": "webgpu_blink_web_tests",
@ -3574,7 +3574,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000"
"--timeout-ms=30000"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@ -3818,7 +3818,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000"
"--timeout-ms=30000"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@ -4062,7 +4062,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000"
"--timeout-ms=30000"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {
@ -4306,7 +4306,7 @@
"args": [
"--initialize-webgpu-adapter-at-startup-timeout-ms=60000",
"--flag-specific=webgpu-with-partial-backend-validation",
"--time-out-ms=30000"
"--timeout-ms=30000"
],
"isolate_name": "webgpu_blink_web_tests",
"merge": {

6
testing/buildbot/chromium.memory.json

@ -12707,7 +12707,7 @@
"--num-retries=3",
"--additional-expectations",
"../../third_party/blink/web_tests/ASANExpectations",
"--time-out-ms",
"--timeout-ms",
"48000",
"--enable-sanitizer"
],
@ -12747,7 +12747,7 @@
"--num-retries=3",
"--additional-expectations",
"../../third_party/blink/web_tests/LeakExpectations",
"--time-out-ms",
"--timeout-ms",
"48000",
"--enable-leak-detection"
],
@ -12784,7 +12784,7 @@
"--num-retries=3",
"--additional-expectations",
"../../third_party/blink/web_tests/MSANExpectations",
"--time-out-ms",
"--timeout-ms",
"66000",
"--enable-sanitizer"
],

2
testing/buildbot/chromium.win.json

@ -8780,7 +8780,7 @@
"args": [
"--num-retries=3",
"--debug",
"--time-out-ms",
"--timeout-ms",
"60000"
],
"experiment_percentage": 100,

2
testing/buildbot/generate_buildbot_json.py

@ -547,7 +547,7 @@ class BBJSONGenerator(object):
elif isinstance(a[key], list) and isinstance(b[key], list):
# Args arrays are lists of strings. Just concatenate them,
# and don't sort them, in order to keep some needed
# arguments adjacent (like --time-out-ms [arg], etc.)
# arguments adjacent (like --timeout-ms [arg], etc.)
if all(isinstance(x, str)
for x in itertools.chain(a[key], b[key])):
a[key] = self.maybe_fixup_args_array(a[key] + b[key])

10
testing/buildbot/test_suite_exceptions.pyl

@ -317,7 +317,7 @@
'args': [
'--additional-expectations',
'../../third_party/blink/web_tests/ASANExpectations',
'--time-out-ms',
'--timeout-ms',
'48000',
'--enable-sanitizer',
],
@ -329,7 +329,7 @@
'args': [
'--additional-expectations',
'../../third_party/blink/web_tests/LeakExpectations',
'--time-out-ms',
'--timeout-ms',
'48000',
'--enable-leak-detection',
],
@ -341,7 +341,7 @@
'args': [
'--additional-expectations',
'../../third_party/blink/web_tests/MSANExpectations',
'--time-out-ms',
'--timeout-ms',
'66000',
'--enable-sanitizer',
],
@ -388,7 +388,7 @@
'Win7 Tests (dbg)(1)': {
'args': [
'--debug',
'--time-out-ms',
'--timeout-ms',
'60000'
],
'experiment_percentage': 100,
@ -3350,7 +3350,7 @@
# Increase the timeout with ASAN (crbug.com/1208253)
'Dawn Win10 x64 ASAN Release': {
'args': [
'--time-out-ms=48000',
'--timeout-ms=48000',
],
},
},

4
testing/buildbot/test_suites.pyl

@ -4038,7 +4038,7 @@
'--initialize-webgpu-adapter-at-startup-timeout-ms=60000',
'--flag-specific=webgpu-with-backend-validation',
# Increase the timeout when using backend validation layers (crbug.com/1208253)
'--time-out-ms=30000',
'--timeout-ms=30000',
],
'win64_args': [ '--target=Release_x64' ],
'mac_args': [
@ -4106,7 +4106,7 @@
'--initialize-webgpu-adapter-at-startup-timeout-ms=60000',
'--flag-specific=webgpu-with-partial-backend-validation',
# Increase the timeout when using backend validation layers (crbug.com/1208253)
'--time-out-ms=30000',
'--timeout-ms=30000',
],
'win64_args': [ '--target=Release_x64' ],
'mac_args': [

4
third_party/blink/tools/blinkpy/web_tests/controllers/manager.py vendored

@ -357,8 +357,8 @@ class Manager(object):
def _test_input_for_file(self, test_file, retry_attempt):
return TestInput(
test_file,
self._options.slow_time_out_ms
if self._test_is_slow(test_file) else self._options.time_out_ms,
self._options.slow_timeout_ms
if self._test_is_slow(test_file) else self._options.timeout_ms,
self._test_requires_lock(test_file),
retry_attempt=retry_attempt)

2
third_party/blink/tools/blinkpy/web_tests/port/base.py vendored

@ -412,7 +412,7 @@ class Port(object):
"""Returns the amount of time in seconds to wait before killing the process in driver.stop()."""
# We want to wait for at least 3 seconds, but if we are really slow, we
# want to be slow on cleanup as well (for things like ASAN, Valgrind, etc.)
return (3.0 * float(self.get_option('time_out_ms', '0')) /
return (3.0 * float(self.get_option('timeout_ms', '0')) /
self._default_timeout_ms())
def default_batch_size(self):

8
third_party/blink/tools/blinkpy/web_tests/run_web_tests.py vendored

@ -554,7 +554,7 @@ def parse_args(args):
help='A colon-separated list of tests to run. Wildcards are '
'NOT supported. It is the same as listing the tests as '
'positional arguments.'),
optparse.make_option('--time-out-ms',
optparse.make_option('--timeout-ms',
help='Set the timeout for each test'),
optparse.make_option(
'--initialize-webgpu-adapter-at-startup-timeout-ms',
@ -693,10 +693,10 @@ def _set_up_derived_options(port, options, args):
if not options.configuration:
options.configuration = port.default_configuration()
if not options.time_out_ms:
options.time_out_ms = str(port.timeout_ms())
if not options.timeout_ms:
options.timeout_ms = str(port.timeout_ms())
options.slow_time_out_ms = str(5 * int(options.time_out_ms))
options.slow_timeout_ms = str(5 * int(options.timeout_ms))
if options.additional_platform_directory:
additional_platform_directories = []

2
third_party/blink/tools/blinkpy/web_tests/views/printing.py vendored

@ -116,7 +116,7 @@ class Printer(object):
self._print_default('Using %s build' % self._options.configuration)
self._print_default(
'Regular timeout: %s, slow test timeout: %s' %
(self._options.time_out_ms, self._options.slow_time_out_ms))
(self._options.timeout_ms, self._options.slow_timeout_ms))
self._print_default('Command line: ' +
' '.join(port.driver_cmd_line()))

4
third_party/blink/tools/blinkpy/web_tests/views/printing_unittest.py vendored

@ -122,8 +122,8 @@ class Testprinter(unittest.TestCase):
printer, err = self.get_printer()
# FIXME: Make it so these options don't have to be set directly.
# pylint: disable=protected-access
printer._options.time_out_ms = 6000
printer._options.slow_time_out_ms = 12000
printer._options.timeout_ms = 6000
printer._options.slow_timeout_ms = 12000
printer._options.order = 'random'
printer._options.seed = 1234
printer.print_config(self._port)

2
third_party/blink/tools/debug_web_tests vendored

@ -5,7 +5,7 @@
# Runs run-webkit-tests and attaches a debugger to the single renderer process.
DEFAULT_TARGET_FLAGS=(--jobs=1 --time-out-ms=100000000 --additional-driver-flag=--no-sandbox --additional-driver-flag=--renderer-startup-dialog)
DEFAULT_TARGET_FLAGS=(--jobs=1 --timeout-ms=100000000 --additional-driver-flag=--no-sandbox --additional-driver-flag=--renderer-startup-dialog)
SAW_DISABLE_FEATURES=false
for TARGET_FLAG in "$@"; do

2
tools/code_coverage/coverage.py

@ -862,7 +862,7 @@ def _GetCommandForWebTests(arguments):
LLVM_PROFILE_FILE_PATH_SUBSTITUTION,
'--child-processes=%d' % cpu_count, '--disable-breakpad',
'--no-show-results', '--skip-failing-tests',
'--target=%s' % os.path.basename(BUILD_DIR), '--time-out-ms=30000'
'--target=%s' % os.path.basename(BUILD_DIR), '--timeout-ms=30000'
]
if arguments.strip():
command_list.append(arguments)