Skip to content

Commit 4549566

Browse files
committed
servo: Upgrade ipc-channel, and make the timeout value in WPT match that of
Gecko in debug mode. One WPT test is still too slow. No reasonable timeout value made it fast enough. Therefore, I have marked the test as a timeout. Optimizing during WPT running or landing rust-lang/cargo#1826 would fix this as well, I suspect.
1 parent e32068d commit 4549566

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

components/servo/Cargo.lock

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ports/cef/Cargo.lock

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ports/gonk/Cargo.lock

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/wpt/harness/wptrunner/browsers/servo.py

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
3434
rv = base_executor_kwargs(test_type, server_config,
3535
cache_manager, **kwargs)
3636
rv["pause_after_test"] = kwargs["pause_after_test"]
37+
# Currently we always run Servo in debug mode. Like Firefox and B2G, we increase the timeout
38+
# threefold in order to compensate for that.
39+
if kwargs["timeout_multiplier"] is None:
40+
rv["timeout_multiplier"] = 3
3741
return rv
3842

3943
def env_options():

tests/wpt/metadata/dom/ranges/Range-mutations.html.ini

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[Range-mutations.html]
22
type: testharness
3+
expected: TIMEOUT
34
[paras[0\].firstChild.splitText(376), with selected range on paras[0\].firstChild from 0 to 1]
45
expected: FAIL
56

0 commit comments

Comments
 (0)