Merge "simpleperf: allow more than one pattern in test.py." am: ab10d26e56

am: dcb00c9026

Change-Id: I07cf585f64b2bd3c4410e0f67a7fb76c072ba5e3

1 files changed, 2 insertions, 6 deletions

diff --git a/simpleperf/scripts/test.py b/simpleperf/scripts/test.py
index caf3fb2a..5ebf652a 100755
--- a/simpleperf/scripts/test.py
+++ b/simpleperf/scripts/test.py
@@ -1700,12 +1700,8 @@ def main():
             log_exit("Can't find test %s" % args.test_from[0])
         tests = tests[start_pos:]
     if args.pattern:
-        pattern = re.compile(fnmatch.translate(args.pattern[0]))
-        new_tests = []
-        for test in tests:
-            if pattern.match(test):
-                new_tests.append(test)
-        tests = new_tests
+        patterns = [re.compile(fnmatch.translate(x)) for x in args.pattern]
+        tests = [t for t in tests if any(pattern.match(t) for pattern in patterns)]
         if not tests:
             log_exit('No tests are matched.')