diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-09-29 19:58:28 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-09-29 19:58:28 -0600 |
| commit | 9a4eb565c4a423ed1278a5e28ad06775695861da (patch) | |
| tree | 9225242f7919fa64827614caa49bf5acd587889d /python/servo/testing_commands.py | |
| parent | a0cb657fe80859dd8862361631268479d1045432 (diff) | |
| parent | a3eee7072754451dd2918babe3d2e41f7be4602a (diff) | |
| download | servo-9a4eb565c4a423ed1278a5e28ad06775695861da.tar.gz servo-9a4eb565c4a423ed1278a5e28ad06775695861da.zip | |
Auto merge of #7789 - 6112:master, r=mbrubeck
allow `./mach test` to run tests in tests/wpt/mozilla/
Allows running WPT tests in the tests/wpt/mozilla/ directory by using commands such as:
```
./mach test tests/wpt/mozilla/tests/mozilla/union.html
```
Fixes #7772.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7789)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/testing_commands.py')
| -rw-r--r-- | python/servo/testing_commands.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 6ec302a40d4..a1f0899b7c3 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -81,18 +81,19 @@ class MachCommands(CommandBase): suites = OrderedDict([ ("tidy", {}), ("ref", {"kwargs": {"kind": render_mode}, - "path": path.abspath(path.join("tests", "ref")), + "paths": [path.abspath(path.join("tests", "ref"))], "include_arg": "name"}), ("wpt", {"kwargs": {"release": release}, - "path": path.abspath(path.join("tests", "wpt", "web-platform-tests")), + "paths": [path.abspath(path.join("tests", "wpt", "web-platform-tests")), + path.abspath(path.join("tests", "wpt", "mozilla"))], "include_arg": "include"}), ("css", {"kwargs": {"release": release}, - "path": path.abspath(path.join("tests", "wpt", "css-tests")), + "paths": [path.abspath(path.join("tests", "wpt", "css-tests"))], "include_arg": "include"}), ("unit", {}), ]) - suites_by_prefix = {v["path"]: k for k, v in suites.iteritems() if "path" in v} + suites_by_prefix = {path: k for k, v in suites.iteritems() if "paths" in v for path in v["paths"]} selected_suites = OrderedDict() |