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

Fixes for mach test-ref argument handling

Browse source 
* Change parameter from `name` to `include`. This is consistent with other
  test suites, and also fixes a bug in `mach test` caused by a conflicting
  keyword parameter in `Registrar.dispatch`.
* Allow any number of `include` arguments.
This commit is contained in:
Matt Brubeck 2015-10-01 08:54:18 -07:00
parent 0c6bb6125c
commit ab68d51eda
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
python/servo/testing_commands.py
View file

@ -83,7 +83,7 @@ class MachCommands(CommandBase):
("tidy", {}), ("tidy", {}),
("ref", {"kwargs": {"kind": render_mode}, ("ref", {"kwargs": {"kind": render_mode},
"paths": [path.abspath(path.join("tests", "ref"))], "paths": [path.abspath(path.join("tests", "ref"))],
"include_arg": "name"}), "include_arg": "include"}),
("wpt", {"kwargs": {"release": release}, ("wpt", {"kwargs": {"release": release},
"paths": [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"))], path.abspath(path.join("tests", "wpt", "mozilla"))],
@ -189,14 +189,14 @@ class MachCommands(CommandBase):
help=HELP_RENDER_MODE) help=HELP_RENDER_MODE)
@CommandArgument('--release', '-r', action='store_true', @CommandArgument('--release', '-r', action='store_true',
help='Run with a release build of Servo') help='Run with a release build of Servo')
@CommandArgument('--name', default=None, @CommandArgument('--include', default=None, nargs='+',
help="Only run tests that match this pattern. If the " help="Only run tests that match this pattern. If the "
"path to the ref test directory is included, it " "path to the ref test directory is included, it "
"will automatically be trimmed out.") "will automatically be trimmed out.")
@CommandArgument( @CommandArgument(
'servo_params', default=None, nargs=argparse.REMAINDER, 'servo_params', default=None, nargs=argparse.REMAINDER,
help="Command-line arguments to be passed through to Servo") help="Command-line arguments to be passed through to Servo")
def test_ref(self, kind=DEFAULT_RENDER_MODE, name=None, servo_params=None, def test_ref(self, kind=DEFAULT_RENDER_MODE, include=None, servo_params=None,
release=False): release=False):
self.ensure_bootstrapped() self.ensure_bootstrapped()
self.ensure_built_tests(release=release) self.ensure_built_tests(release=release)
@ -210,17 +210,17 @@ class MachCommands(CommandBase):
for k in kinds: for k in kinds:
print("Running %s reftests..." % k) print("Running %s reftests..." % k)
test_args = [k, test_path] test_args = [k, test_path]
if name is not None: if include is not None:
maybe_path = path.normpath(name)
ref_path = path.join("tests", "ref") ref_path = path.join("tests", "ref")
for name in include:
# Check to see if we were passed something leading with the # Check to see if we were passed something leading with the
# path to the ref test directory, and trim it so that reftest # path to the ref test directory, and trim it so that reftest
# knows how to filter it. # knows how to filter it.
if ref_path in maybe_path: maybe_path = path.normpath(name)
test_args.append(path.relpath(maybe_path, ref_path)) if ref_path in maybe_path:
else: test_args.append(path.relpath(maybe_path, ref_path))
test_args.append(name) else:
test_args.append(name)
if servo_params is not None: if servo_params is not None:
test_args += ["--"] + servo_params test_args += ["--"] + servo_params
ret = self.run_test("reftest", test_args, release=release) ret = self.run_test("reftest", test_args, release=release)