summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-01-23 18:48:17 -0800
committerIgor Murashkin <iam@google.com>2014-01-24 16:03:11 -0800
commitf9cfbd39aed85c3eeaca72493bdd5a673af31b1e (patch)
treead0eee0a70669a253e36e0f82c308cdbec5fe5a3 /testrunner
parent8d703533ba4cdff73ac80d78a20b70de39934e1e (diff)
downloadandroid_development-f9cfbd39aed85c3eeaca72493bdd5a673af31b1e.tar.gz
android_development-f9cfbd39aed85c3eeaca72493bdd5a673af31b1e.tar.bz2
android_development-f9cfbd39aed85c3eeaca72493bdd5a673af31b1e.zip
runtest: add an extra pattern for gtest file names (*Tests.[c|cpp])
Change-Id: Ia8070804110e8064f79a8063ed6aefc92d71bf7a
Diffstat (limited to 'testrunner')
-rw-r--r--testrunner/test_defs/gtest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/testrunner/test_defs/gtest.py b/testrunner/test_defs/gtest.py
index dc72f94ca..cceead960 100644
--- a/testrunner/test_defs/gtest.py
+++ b/testrunner/test_defs/gtest.py
@@ -73,6 +73,7 @@ class GTestFactory(test_suite.AbstractTestFactory):
- test_*.[c|cc|cpp]
- *_test.[c|cc|cpp]
- *_unittest.[c|cc|cpp]
+ - *Tests.[cc|cpp]
"""
if not sub_tests_path:
@@ -101,6 +102,7 @@ class GTestFactory(test_suite.AbstractTestFactory):
- test_*.[cc|cpp]
- *_test.[cc|cpp]
- *_unittest.[cc|cpp]
+ - *Tests.[cc|cpp]
This method is a callback for os.path.walk.
@@ -115,6 +117,6 @@ class GTestFactory(test_suite.AbstractTestFactory):
def _EvaluateFile(self, test_list, file):
(name, ext) = os.path.splitext(file)
if ext == ".cc" or ext == ".cpp" or ext == ".c":
- if re.search("_test$|_test_$|_unittest$|_unittest_$|^test_", name):
+ if re.search("_test$|_test_$|_unittest$|_unittest_$|^test_|Tests$", name):
logger.SilentLog("Found native test file %s" % file)
test_list.append(name)