mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #26772 - jdm:wpt-test-types, r=manishearth
Run only a supported set of WPT test types by default. wptrunner introduced a new test type for print reftests, and by default any unsupported type causes the test runner to report an unexpected error, even if none of those tests are run. These changes avoid similar breakage by limiting the default test types to ones that are supported by our test runners.
This commit is contained in:
commit
17ac381513
1 changed files with 10 additions and 0 deletions
|
@ -82,6 +82,8 @@ def create_parser_wpt():
|
|||
help="Servo's JSON logger of unexpected results")
|
||||
parser.add_argument('--always-succeed', default=False, action="store_true",
|
||||
help="Always yield exit code of zero")
|
||||
parser.add_argument('--no-default-test-types', default=False, action="store_true",
|
||||
help="Run all of the test types provided by wptrunner or specified explicitly by --test-types"),
|
||||
return parser
|
||||
|
||||
|
||||
|
@ -463,6 +465,14 @@ class MachCommands(CommandBase):
|
|||
binary_args.append("--pref=" + pref)
|
||||
kwargs["binary_args"] = binary_args
|
||||
|
||||
if not kwargs.get('no_default_test_types'):
|
||||
test_types = {
|
||||
"servo": ["testharness", "reftest", "wdspec"],
|
||||
"servodriver": ["testharness", "reftest"],
|
||||
}
|
||||
product = kwargs.get("product") or "servo"
|
||||
kwargs["test_types"] = test_types[product]
|
||||
|
||||
run_globals = {"__file__": run_file}
|
||||
exec(compile(open(run_file).read(), run_file, 'exec'), run_globals)
|
||||
return run_globals["run_tests"](**kwargs)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue