summaryrefslogtreecommitdiffstats
path: root/testrunner
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2013-06-03 10:32:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-03 10:32:37 -0700
commite7d110635c93794b412918f222278b8c4aaee993 (patch)
tree449a0d193e1d0b8e5c20a1f322c123c900cb88ce /testrunner
parentc30ae6d59eeae1366e7e1d7e6e964745945b41bb (diff)
parent4ab82c48e97a3b45372486dae92ae1cc0e16e725 (diff)
downloadandroid_development-e7d110635c93794b412918f222278b8c4aaee993.tar.gz
android_development-e7d110635c93794b412918f222278b8c4aaee993.tar.bz2
android_development-e7d110635c93794b412918f222278b8c4aaee993.zip
am 4ab82c48: am 9662fbd2: Merge "Added the test def for new camera native tests." into jb-mr2-dev
* commit '4ab82c48e97a3b45372486dae92ae1cc0e16e725': Added the test def for new camera native tests.
Diffstat (limited to 'testrunner')
-rw-r--r--testrunner/test_defs.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index 4a86011d0..516dc7c1e 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -187,6 +187,13 @@ See test_defs.xsd for more information.
runner=".MediaFrameworkUnitTestRunner"
coverage_target="framework" />
+<test-native name="camera-client-native"
+ build_path="frameworks/av/camera/tests/"
+ description="Camera client native tests." />
+
+<test-native name="camera-hal2-native"
+ build_path="hardware/libhardware/tests/camera2"
+ description="Camera hal2 native tests." />
<!-- end of media framework tests -->
<!-- targeted framework tests -->