[lit] Refine filter error handling

Picking a default filter `.*` that matches everything lets us streamline
some error handling code.
This commit is contained in:
Julian Lettner
2020-04-02 11:06:28 -07:00
parent cab904c6d3
commit 022f1e2cc8
2 changed files with 14 additions and 17 deletions

View File

@@ -133,7 +133,7 @@ def parse_args():
metavar="REGEX",
type=_case_insensitive_regex,
help="Only run tests with paths matching the given regular expression",
default=os.environ.get("LIT_FILTER"))
default=os.environ.get("LIT_FILTER", ".*"))
selection_group.add_argument("--num-shards", # TODO(yln): --shards N/M
dest="numShards",
metavar="M",

View File

@@ -57,22 +57,19 @@ def main(builtin_params={}):
print_suites_or_tests(discovered_tests, opts)
return
if opts.filter:
filtered_tests = [t for t in discovered_tests if
opts.filter.search(t.getFullName())]
if not filtered_tests:
sys.stderr.write('error: filter did not match any tests '
'(of %d discovered). ' % len(discovered_tests))
if opts.allow_empty_runs:
sys.stderr.write('Suppressing error because '
"'--allow-empty-runs' was specified.\n")
sys.exit(0)
else:
sys.stderr.write("Use '--allow-empty-runs' to suppress this "
'error.\n')
sys.exit(2)
else:
filtered_tests = discovered_tests
filtered_tests = [t for t in discovered_tests if
opts.filter.search(t.getFullName())]
if not filtered_tests:
sys.stderr.write('error: filter did not match any tests '
'(of %d discovered). ' % len(discovered_tests))
if opts.allow_empty_runs:
sys.stderr.write("Suppressing error because '--allow-empty-runs' "
'was specified.\n')
sys.exit(0)
else:
sys.stderr.write("Use '--allow-empty-runs' to suppress this "
'error.\n')
sys.exit(2)
determine_order(filtered_tests, opts.order)