summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason Noguchi <jnoguchi@google.com>2013-02-13 15:35:23 -0800
committerJason Noguchi <jnoguchi@google.com>2013-02-14 16:18:57 -0800
commite6371c5d61e79d7c8d11f106845b96ccc561660e (patch)
tree33c17ea964a698285a859a5cf41df7f50d493c71 /tests
parentfde04a552110d4891f1d3199b184bb4f930e9a00 (diff)
downloadandroid_packages_apps_Snap-e6371c5d61e79d7c8d11f106845b96ccc561660e.tar.gz
android_packages_apps_Snap-e6371c5d61e79d7c8d11f106845b96ccc561660e.tar.bz2
android_packages_apps_Snap-e6371c5d61e79d7c8d11f106845b96ccc561660e.zip
Merging camera test with gallery test.
Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841
Diffstat (limited to 'tests')
-rw-r--r--tests/AndroidManifest.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 1d53d4dd3..ef63cc414 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -25,7 +25,15 @@
android:targetPackage="com.android.gallery3d"
android:label="Tests for GalleryNew3D application."/>
+ <instrumentation android:name="com.android.gallery3d.CameraTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Camera continuous test runner"/>
+
<instrumentation android:name="com.android.gallery3d.exif.ExifTestRunner"
android:targetPackage="com.android.gallery3d"
android:label="Tests for ExifParser."/>
+
+ <instrumentation android:name="com.android.gallery3d.stress.CameraStressTestRunner"
+ android:targetPackage="com.android.gallery3d"
+ android:label="Camera stress test runner"/>
</manifest>