diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-06-16 08:41:16 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-06-16 08:41:16 -0600 |
| commit | ee22ae263515c2804b739ead4c02bc7333c3965c (patch) | |
| tree | cd78c40e6a69c33f33e8009f59e174f0318852cb | |
| parent | 48e1d45bffaf7679d1f9487038a104f373a90e5a (diff) | |
| parent | fa058760b767f60a3dee8ae7fa8381ec8f7e3c36 (diff) | |
| download | servo-ee22ae263515c2804b739ead4c02bc7333c3965c.tar.gz servo-ee22ae263515c2804b739ead4c02bc7333c3965c.zip | |
Auto merge of #6398 - jgraham:wptrunner_upgrade_servodriver, r=Ms2ger
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 -->
| -rw-r--r-- | tests/wpt/harness/test/test.cfg.example | 2 | ||||
| -rw-r--r-- | tests/wpt/harness/wptrunner/browsers/servodriver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/wpt/harness/test/test.cfg.example b/tests/wpt/harness/test/test.cfg.example index 373e53faaf6..6a4057e2200 100644 --- a/tests/wpt/harness/test/test.cfg.example +++ b/tests/wpt/harness/test/test.cfg.example @@ -8,7 +8,7 @@ ssl-type=none # prefs-root=/path/to/gecko-src/testing/profiles/ # [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 # [chrome] diff --git a/tests/wpt/harness/wptrunner/browsers/servodriver.py b/tests/wpt/harness/wptrunner/browsers/servodriver.py index ceb1625237a..656a8b51f40 100644 --- a/tests/wpt/harness/wptrunner/browsers/servodriver.py +++ b/tests/wpt/harness/wptrunner/browsers/servodriver.py @@ -42,7 +42,7 @@ def browser_kwargs(**kwargs): "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, cache_manager, **kwargs) return rv |