aboutsummaryrefslogtreecommitdiff
path: root/framework/core.py
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-02-24 10:01:14 -0800
committerKenneth Graunke <kenneth@whitecape.org>2012-02-24 10:02:22 -0800
commit1ed2bf185c2992652b2694980fcf01c7f18102c1 (patch)
tree14930f0a919b2dd851cceeac5db5b9088ec9fa46 /framework/core.py
parentf53316137684e55393b72c0bfa1b62516b8281a3 (diff)
framework: Fix lack-of-filtering of included tests.
Commit 4fbe147b5817b2ba0fe44fe9db96a2d05288aee introduced a regression where not specifying a -t option would result in all tests being excluded. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'framework/core.py')
-rw-r--r--framework/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/core.py b/framework/core.py
index a84c68ff..e2e80978 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -521,7 +521,7 @@ class TestProfile:
return True in map(lambda r: r.search(x) != None, re_list)
def test_matches((path, test)):
- return (matches_any_regexp(path, env.filter) and
+ return ((not env.filter or matches_any_regexp(path, env.filter)) and
not matches_any_regexp(path, env.exclude_filter))
# Filter out unwanted tests