summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2009-08-14 11:01:58 -0700
committerXia Wang <xiaw@google.com>2009-08-14 15:58:36 -0700
commit12ad9fb10e1be799fa47a56ee1f1429b761db6e6 (patch)
tree338c5aa5a8a76d8c0984b9df215aad4e7da8ef14 /testrunner
parent25ec799863219bfa1b5b8c71b5033cb450e70918 (diff)
downloadandroid_development-12ad9fb10e1be799fa47a56ee1f1429b761db6e6.tar.gz
android_development-12ad9fb10e1be799fa47a56ee1f1429b761db6e6.tar.bz2
android_development-12ad9fb10e1be799fa47a56ee1f1429b761db6e6.zip
1. Add .c extension to native_test.py so that native test in C can also be picked up by testrunner.
2. Add netkeystore_test into continuous test cycle.
Diffstat (limited to 'testrunner')
-rw-r--r--testrunner/test_defs.xml6
-rw-r--r--testrunner/test_defs/native_test.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 67e168498..48a678626 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -466,6 +466,12 @@ See test_defs.xsd for more information.
description="Android STL."
extra_build_args="ASTL_TESTS=1" />
+<!-- Android Keystore tests -->
+<test-native name="netkeystore_test"
+ build_path="frameworks/base/cmds/keystore/tests"
+ description="Android keystore."
+ extra_build_args="KEYSTORE_TESTS=1" />
+
<!-- pending patch 820
<test-native name="gtest"
build_path="external/gtest"
diff --git a/testrunner/test_defs/native_test.py b/testrunner/test_defs/native_test.py
index 1541cc1ec..d250de2b2 100644
--- a/testrunner/test_defs/native_test.py
+++ b/testrunner/test_defs/native_test.py
@@ -125,7 +125,7 @@ class NativeTestSuite(AbstractTestSuite):
"""
for f in files:
(name, ext) = os.path.splitext(f)
- if ext == ".cc" or ext == ".cpp":
+ if ext == ".cc" or ext == ".cpp" or ext == ".c":
if re.search("_test$|_test_$|_unittest$|_unittest_$|^test_", name):
logger.SilentLog("Found %s" % f)
test_list.append(str(os.path.join(dirname, f)))