From a3eee7072754451dd2918babe3d2e41f7be4602a Mon Sep 17 00:00:00 2001 From: Nicolas Date: Tue, 29 Sep 2015 17:27:04 -0400 Subject: [PATCH] allow `./mach test` to run tests in tests/wpt/mozilla/ --- python/servo/testing_commands.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index f8841c51d92..db5c3795219 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()