cheets_CTS_P/R: No [instant] tests in cts-hardware suite.
BUG=b:203827314
TEST=none
Change-Id: I43b908d3386c9e73779f3df22fcb2661b638695b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3274696
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_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index fb404d0..a98dd3c 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -513,8 +513,7 @@
'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*'
],
'CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite': [
- '--include-filter', 'CtsDeqpTestCases', '--module',
- 'CtsDeqpTestCases', '--test',
+ '--module', 'CtsDeqpTestCases', '--test',
'dEQP-GLES3.functional.prerequisite#*'
],
'CtsDeqpTestCases.dEQP-GLES31': [
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index d0777ae..557dca6 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -417,8 +417,7 @@
'CtsDeqpTestCases', '--test', 'dEQP-GLES3.*'
],
'CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite': [
- '--include-filter', 'CtsDeqpTestCases', '--module',
- 'CtsDeqpTestCases', '--test',
+ '--module', 'CtsDeqpTestCases', '--test',
'dEQP-GLES3.functional.prerequisite#*'
],
'CtsDeqpTestCases.dEQP-GLES31': [
@@ -715,7 +714,7 @@
'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy',
],
'CtsMediaTestCases.exclude-GLView': [
- '-m',
+ '--module',
'CtsMediaTestCases',
'--exclude-filter',
'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy',
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 9a4e4be..15f613d 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -652,6 +652,26 @@
special_cmd = _get_special_command_line(modules, is_public)
if special_cmd:
+ # For hardware suite we want to exclude [instant] modules.
+ # For that purpose, replace --module by --include-filter works.
+ if is_hardware:
+ try:
+ i = special_cmd.index('--module')
+ if i + 3 < len(special_cmd) and special_cmd[i +
+ 2] == '--test':
+ # [--module, x, --test, y] ==> [--include-filter, "x y"]
+ special_cmd = special_cmd[:i] + [
+ '--include-filter',
+ '%s %s' %
+ (special_cmd[i + 1], special_cmd[i + 3])
+ ] + special_cmd[i + 4:]
+ else:
+ # [--module, x] ==> [--include-filter, x]
+ special_cmd = special_cmd[:i] + [
+ '--include-filter'
+ ] + special_cmd[i + 1:]
+ except:
+ pass
cmd.extend(special_cmd)
elif _ALL in modules:
pass
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
index f68a2fa..b4df2f5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 6a0f60a..13bda77 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
index 793d2ac..f974dce 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
index 74f07e7..dd93b9e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.other.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='9.0_r17.arm.CtsMediaTestCases.other.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.other.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
index 793cf0c..4799f89 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 8b7e361..1b64d29 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
index ed9f2db..5fd8db7 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
index 78e934c..58ab66f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.other.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='9.0_r17.x86.CtsMediaTestCases.other.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.other.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware
index b9e4c9b..7fe8cb8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_P.arm.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 9a93e33..84668e7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_P.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware
index 5c0e45a..ebe2f0d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_P.arm.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware
index 1e3021a..05ce973 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.other.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaTestCases.other.ctshardware',
test_name='cheets_CTS_P.arm.CtsMediaTestCases.other.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware
index 175549c..cf459af 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_P.x86.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index f28b7cf..2128fdf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_P.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware
index 0fa2729..b80c2d9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_P.x86.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware
index 9d9331e..9eb586a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.other.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaTestCases.other.ctshardware',
test_name='cheets_CTS_P.x86.CtsMediaTestCases.other.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoDecoderPerfTest', '--exclude-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsAppTestCases.feature.ctshardware
index b950c96..86048de 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index f51b5cc..c552f42 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases 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.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 9cbf2ec..0f89a02 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaStressTestCases.camera.ctshardware
index d8f3089..ffd7817 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='11_r5.arm.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView
index 6d80f04..283e0f8 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='11_r5.arm.CtsMediaTestCases.exclude-GLView',
test_name='cheets_CTS_R.11_r5.arm.CtsMediaTestCases.exclude-GLView',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView.ctshardware
index 349fca8..cffe7eb 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.exclude-GLView.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='11_r5.arm.CtsMediaTestCases.exclude-GLView.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsMediaTestCases.exclude-GLView.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsAppTestCases.feature.ctshardware
index 37dee2d..c8deb41 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index f5b153c..c11b902 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases 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.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index e242a35..9c7d5bc 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaStressTestCases.camera.ctshardware
index 6c5034f..55be0e2 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='11_r5.x86.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView
index 6973836..65b2731 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='11_r5.x86.CtsMediaTestCases.exclude-GLView',
test_name='cheets_CTS_R.11_r5.x86.CtsMediaTestCases.exclude-GLView',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView.ctshardware
index 7129bad..6fe80cb 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.exclude-GLView.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='11_r5.x86.CtsMediaTestCases.exclude-GLView.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsMediaTestCases.exclude-GLView.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsAppTestCases.feature.ctshardware
index c8bf45a..0b19804 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_R.arm.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index 803b280..83de405 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.arm.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases 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.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 11e3edc..16613d6 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_R.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaStressTestCases.camera.ctshardware
index c6a103b..b767488 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaStressTestCases.camera.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_R.arm.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView
index a51fc41..c0e5868 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaTestCases.exclude-GLView',
test_name='cheets_CTS_R.arm.CtsMediaTestCases.exclude-GLView',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView.ctshardware
index c8dffe8..021217b 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.exclude-GLView.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaTestCases.exclude-GLView.ctshardware',
test_name='cheets_CTS_R.arm.CtsMediaTestCases.exclude-GLView.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsAppTestCases.feature.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsAppTestCases.feature.ctshardware
index bd3e58f..279965e 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsAppTestCases.feature.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsAppTestCases.feature.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsAppTestCases.feature.ctshardware',
test_name='cheets_CTS_R.x86.CtsAppTestCases.feature.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsAppTestCases', '--test', 'android.app.cts.SystemFeaturesTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases android.app.cts.SystemFeaturesTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases.feature',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
index 73baa50..7808edd 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
test_name='cheets_CTS_R.x86.CtsCameraTestCases.NativeCameraDeviceTest.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--test', 'android.hardware.camera2.cts.NativeCameraDeviceTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases 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.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
index 22d0ad9..4164a29 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
test_name='cheets_CTS_R.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaStressTestCases.camera.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaStressTestCases.camera.ctshardware
index bc0f361..f40485c 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaStressTestCases.camera.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaStressTestCases.camera.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaStressTestCases.camera.ctshardware',
test_name='cheets_CTS_R.x86.CtsMediaStressTestCases.camera.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaStressTestCases', '--test', 'android.mediastress.cts.MediaRecorderStressTest'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases android.mediastress.cts.MediaRecorderStressTest'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases.camera',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView
index b378324..0016e15 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaTestCases.exclude-GLView',
test_name='cheets_CTS_R.x86.CtsMediaTestCases.exclude-GLView',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
+ run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView.ctshardware
index e560729..4359411 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.exclude-GLView.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaTestCases.exclude-GLView.ctshardware',
test_name='cheets_CTS_R.x86.CtsMediaTestCases.exclude-GLView.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '-m', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerHeightDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest#testGLViewLargerWidthDecodeAccuracy', '--exclude-filter', 'CtsMediaTestCases android.media.cts.MediaExtractorTest#testProgramStreamExtraction', '--exclude-filter', 'CtsMediaTestCases[instant] android.media.cts.MediaExtractorTest#testProgramStreamExtraction'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
