cheets_CTS_R: Make sure to include [instant] variant for custom camera tests.
Tradefed's --module option implicitly includes both the
normal and the [instant] tests. --include-filter option
or <Entry include=...> tag only imports the precisely
specified module. We need to make sure both are included.
BUG=b:203737433
TEST=cheets_CTS_R.arm.waivers run [instant] recording tests.
TEST=cheets_CTS_R.arm.CtsCameraTestCases.NativeCameraDeviceTest
Change-Id: I0de667db9a0f0943f12fae6da4b6b309dfa6ee42
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3237007
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Rohit Makasana <rohitbm@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Rohit Makasana <rohitbm@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index f347a57..83fbf03 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -357,8 +357,10 @@
CONFIG['EXTRA_COMMANDLINE'] = {
'CtsCameraTestCases.NativeCameraDeviceTest': [
- '--include-filter',
- 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest',
+ '--module',
+ 'CtsCameraTestCases',
+ '--test',
+ 'android.hardware.camera2.cts.NativeCameraDeviceTest',
],
'CtsDeqpTestCases.dEQP-EGL': [
'--include-filter', 'CtsDeqpTestCases', '--module',
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest
index 7476cc8..021502d 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
max_retry=9,
tag='11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest
index 1daa59c..18aa399 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
max_retry=9,
tag='11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
index 00e47f7..cc5e86d 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.arm.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
index 98f3208..acca638 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsCameraTestCases.NativeCameraDeviceTest',
test_name='cheets_CTS_R.x86.CtsCameraTestCases.NativeCameraDeviceTest',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases android.hardware.camera2.cts.NativeCameraDeviceTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/subplans/waivers.xml b/server/site_tests/cheets_CTS_R/subplans/waivers.xml
index 97874f7..7905a94 100644
--- a/server/site_tests/cheets_CTS_R/subplans/waivers.xml
+++ b/server/site_tests/cheets_CTS_R/subplans/waivers.xml
@@ -8,6 +8,7 @@
-->
<Entry include="CtsAppSecurityHostTestCases android.appsecurity.cts.DocumentsTest#testRestrictStorageAccessFrameworkDisabled_notBlockFromTree" />
<Entry include="CtsCameraTestCases android.hardware.camera2.cts.RecordingTest" />
+ <Entry include="CtsCameraTestCases[instant] android.hardware.camera2.cts.RecordingTest" />
<Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.host_visible#import_multiple_times" />
<Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#bind_export_import_bind" />
<Entry include="CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.image#export_bind_import_bind" />
