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

infer_test_by_dir cleanup

Browse source 
No actual change in functionality here. I was just unhappy with the way
test-ref was singled out before, and realized an obvious fix.
This commit is contained in:
Matthew Rasmus 2014-12-01 12:51:49 -08:00
parent 9afdce4405
commit 3a6b6792ae
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
python/servo/testing_commands.py
View file

@ -53,23 +53,22 @@ class MachCommands(CommandBase):
return 1
test_dirs = [
(path.join("tests", "content"), "test-content"),
(path.join("tests", "wpt"), "test-wpt"),
# path, mach test command, optional flag for path argument
(path.join("tests", "content"), "test-content", None),
(path.join("tests", "wpt"), "test-wpt", None),
(path.join("tests", "ref"), "test-ref", ["--name"]),
]
if path.join("tests", "ref") in maybe_path:
# test-ref is the outcast here in that it does not accept
# individual files as arguments unless passed through with --name
args = [mach_command, "test-ref",
"--name", maybe_path] + params[1:]
for test_dir, test_name, path_flag in test_dirs:
if not path_flag:
path_arg = []
if test_dir in maybe_path:
args = ([mach_command, test_name] + path_flag +
[maybe_path] + params[1:])
break
else:
for test_dir, test_name in test_dirs:
if test_dir in maybe_path:
args = [mach_command, test_name, maybe_path] + params[1:]
break
else:
print("%s is not a valid test file or directory" % maybe_path)
return 1
print("%s is not a valid test file or directory" % maybe_path)
return 1
return subprocess.call(args, env=self.build_env())