Index: tools/run-tests.py |
diff --git a/tools/run-tests.py b/tools/run-tests.py |
index ae56e756a00c193316cf4f06e68b5c1ca6f5f10a..9b72f56f6e24fe1976ca4f2be1f47ed721007fc7 100755 |
--- a/tools/run-tests.py |
+++ b/tools/run-tests.py |
@@ -271,8 +271,9 @@ def BuildOptions(): |
result.add_option("--extra-flags", |
help="Additional flags to pass to each test command", |
default="") |
+ # TODO(machenbach): Remove this flag when not reference by infrastructure. |
result.add_option("--ignition-turbofan", |
- help="Skip tests which don't run in ignition_turbofan", |
+ help="Deprecated", |
default=False, action="store_true") |
result.add_option("--isolates", help="Whether to test isolates", |
default=False, action="store_true") |
@@ -779,7 +780,6 @@ def Execute(arch, mode, args, options, suites): |
"deopt_fuzzer": False, |
"gc_stress": options.gc_stress, |
"gcov_coverage": options.gcov_coverage, |
- "ignition_turbofan": options.ignition_turbofan, |
"isolates": options.isolates, |
"mode": MODES[mode]["status_mode"], |
"no_i18n": options.no_i18n, |
@@ -802,8 +802,12 @@ def Execute(arch, mode, args, options, suites): |
if len(args) > 0: |
s.FilterTestCasesByArgs(args) |
all_tests += s.tests |
+ |
+ # First filtering by status applying the generic rules (independent of |
+ # variants). |
s.FilterTestCasesByStatus(options.warn_unused, options.slow_tests, |
options.pass_fail_tests) |
+ |
if options.cat: |
verbose.PrintTestSource(s.tests) |
continue |
@@ -831,6 +835,12 @@ def Execute(arch, mode, args, options, suites): |
else: |
s.tests = variant_tests |
+ # Second filtering by status applying the rules for virtual test cases |
+ # (i.e. contrieved test paths containing the variant name and the test |
Jakob Kummerow
2016/08/02 14:13:09
nit: s/contrieved/contrived/
|
+ # name). |
+ s.FilterTestCasesByStatus(options.warn_unused, options.slow_tests, |
+ options.pass_fail_tests, virtual=True) |
+ |
s.tests = ShardTests(s.tests, options) |
num_tests += len(s.tests) |