summaryrefslogtreecommitdiffstats
path: root/camera/device
diff options
context:
space:
mode:
authorZhuoyao Zhang <zhuoyao@google.com>2018-05-24 18:38:36 -0700
committerZhuoyao Zhang <zhuoyao@google.com>2018-05-25 17:57:20 +0000
commitb5b135c8287c934949ca0e443cd4e82325305ed1 (patch)
tree1296c2e59a40dd4985ab64ada7245b2b1fc4bbbb /camera/device
parent17961d1796735cdaf2eed996901491f6e9b6f0cc (diff)
downloadplatform_test_vts-testcase_hal-b5b135c8287c934949ca0e443cd4e82325305ed1.tar.gz
platform_test_vts-testcase_hal-b5b135c8287c934949ca0e443cd4e82325305ed1.tar.bz2
platform_test_vts-testcase_hal-b5b135c8287c934949ca0e443cd4e82325305ed1.zip
Update the hal adapter test configure
* Add module_controller for each adapter test to skip the test module if the targeting HAL is not available on the device. * Update the test script to generate the AT.xml Test: make vts vts-tradefed run vts-hal-adapter -m VtsHalCameraDeviceV3_3Adapter Change-Id: Icf9acae0facbb46b05c41ec4682cf9ff822f4370
Diffstat (limited to 'camera/device')
-rw-r--r--camera/device/V3_3/adapter/AndroidTest.xml3
-rw-r--r--camera/device/V3_4/adapter/AndroidTest.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/camera/device/V3_3/adapter/AndroidTest.xml b/camera/device/V3_3/adapter/AndroidTest.xml
index 2c9e7d34..7c1728d1 100644
--- a/camera/device/V3_3/adapter/AndroidTest.xml
+++ b/camera/device/V3_3/adapter/AndroidTest.xml
@@ -15,6 +15,9 @@
-->
<configuration description="Config for VTS VtsHalCameraDeviceV3_3Adapter test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
+ <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
+ <option name="hal-package-name" value="android.hardware.camera.device@3.3"/>
+ </object>
<target_preparer class="com.android.tradefed.targetprep.VtsHalAdapterPreparer">
<option name="adapter-binary-name" value="android.hardware.camera.device@3.2-adapter"/>
<option name="hal-package-name" value="android.hardware.camera.device@3.3"/>
diff --git a/camera/device/V3_4/adapter/AndroidTest.xml b/camera/device/V3_4/adapter/AndroidTest.xml
index ff531740..6d4396eb 100644
--- a/camera/device/V3_4/adapter/AndroidTest.xml
+++ b/camera/device/V3_4/adapter/AndroidTest.xml
@@ -15,6 +15,9 @@
-->
<configuration description="Config for VTS VtsHalCameraDeviceV3_4Adapter test cases">
<option key="plan" name="config-descriptor:metadata" value="vts-hal-adapter"/>
+ <object class="com.android.tradefed.module.VtsHalAdapterModuleController" type="module_controller">
+ <option name="hal-package-name" value="android.hardware.camera.device@3.4"/>
+ </object>
<target_preparer class="com.android.tradefed.targetprep.VtsHalAdapterPreparer">
<option name="adapter-binary-name" value="android.hardware.camera.device@3.3-adapter"/>
<option name="hal-package-name" value="android.hardware.camera.device@3.4"/>