Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6398 - jgraham:wptrunner_upgrade_servodriver, r=Ms2ger

Browse source 
Fixes issue with servodriver

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6398)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-16 08:41:16 -06:00
commit ee22ae2635
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/wpt/harness/test/test.cfg.example
View file

@ -8,7 +8,7 @@ ssl-type=none
# prefs-root=/path/to/gecko-src/testing/profiles/ # prefs-root=/path/to/gecko-src/testing/profiles/
# [servo] # [servo]
# binary=/path/to/servo-src/target/release/servo # binary=/path/to/servo-src/components/servo/target/servo
# exclude=testharness # Because it needs a special testharness.js # exclude=testharness # Because it needs a special testharness.js
# [chrome] # [chrome]

2
tests/wpt/harness/wptrunner/browsers/servodriver.py
View file

@ -42,7 +42,7 @@ def browser_kwargs(**kwargs):
"debug_info": kwargs["debug_info"]} "debug_info": kwargs["debug_info"]}
def executor_kwargs(test_type, server_config, cache_manager, **kwargs): def executor_kwargs(test_type, server_config, cache_manager, run_info_data, **kwargs):
rv = base_executor_kwargs(test_type, server_config, rv = base_executor_kwargs(test_type, server_config,
cache_manager, **kwargs) cache_manager, **kwargs)
return rv return rv