cheets_CTS_P/R: Do not run [instant] tests in cts-hardware
The --module tradefed flag includes all the variants
for execution. --inlude-filter only adds the un-parameterized
one.
BUG=b:203827314
TEST=the generated control files do not emit --module
Change-Id: Id2261652f247de21ada0688770e41dfdd4d28381
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3269793
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Rohit Makasana <rohitbm@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Rohit Makasana <rohitbm@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_common.py b/server/cros/tradefed/generate_controlfiles_common.py
index 5e2a43e..1981f35 100755
--- a/server/cros/tradefed/generate_controlfiles_common.py
+++ b/server/cros/tradefed/generate_controlfiles_common.py
@@ -668,7 +668,7 @@
cmd.extend(special_cmd)
elif _ALL in modules:
pass
- elif len(modules) == 1:
+ elif len(modules) == 1 and not is_hardware:
cmd += ['--module', list(modules)[0]]
else:
if whole_module_set is None:
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
index 6a020a5..dd80545 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsCameraTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
index e703c58..ba5ef12 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsMediaTestCases.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='9.0_r17.arm.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--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.arm.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
index 913fd2d..b5571b2 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
index cfadf38..d043541 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsNetTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
index d7f9c2a..1f1cdec 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
index 60c7d41..76d7e09 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSensorTestCases.ctshardware
@@ -24,7 +24,7 @@
max_retry=30,
tag='9.0_r17.arm.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index 964ddc4..c09224a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
index ae25fbd..175516f 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
index b8d27a6..da90877 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.arm.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.arm.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
index b139ffc..d668d9b 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsCameraTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
index d0083f0..c23b7e5 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsMediaTestCases.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='9.0_r17.x86.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
index 7f0b4e6..4c9557e 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
index 0821256..7fc4684 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsNetTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
index dab7836..67ef993 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
index 7f2c7dc..2c6c544 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSensorTestCases.ctshardware
@@ -24,7 +24,7 @@
max_retry=30,
tag='9.0_r17.x86.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index a8e23da..ae58b94 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
index 1808076..aa99ebb 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
index 9e5380a..b39256a 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='9.0_r17.x86.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_P.9.0_r17.x86.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware
index 747a264..c55a349 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware
index 97f7dcd..b89061b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases'],
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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
index dffe370..1be9f54 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware
index b6e9841..8a31eae 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases.ctshardware
@@ -25,7 +25,7 @@
max_retry=10,
tag='arm.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware
index b9d71df..aa52f71 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware
index 9732bd9..0be17f1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases.ctshardware
@@ -24,7 +24,7 @@
max_retry=12,
tag='arm.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index 521b517..08f10c2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware
index 57e93a2..bcf756e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases.ctshardware
@@ -25,7 +25,7 @@
max_retry=10,
tag='arm.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware
index a26eaaf..b6e2ba4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_P.arm.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware
index 7befa0f..28e8054 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware
index 9da9b18..6c3cabf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases'],
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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
index 4e02636..cea776e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware
index cef74f0..e903b5b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases.ctshardware
@@ -25,7 +25,7 @@
max_retry=10,
tag='x86.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware
index fc1486c..961de50 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware
index c7d823f..8065329 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases.ctshardware
@@ -24,7 +24,7 @@
max_retry=12,
tag='x86.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index 855520e..04e78db 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware
index 100440a..365e786 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases.ctshardware
@@ -25,7 +25,7 @@
max_retry=10,
tag='x86.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware
index 74b9d31..3af1c28 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_P.x86.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.ctshardware
index a0835c8..5fb2734 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsCameraTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--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.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.ctshardware
index eb0ccd9..3f98d21 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsMediaTestCases.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='11_r5.arm.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNativeMediaAAudioTestCases.ctshardware
index 8b64b1d..b7bc68d 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNetTestCases.ctshardware
index f4eedf3..0dc407f 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsNetTestCases.ctshardware
@@ -28,7 +28,7 @@
iterations=1,
tag='11_r5.arm.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsPerfettoTestCases.ctshardware
index 9e68726..a476bd7 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSensorTestCases.ctshardware
index f38b560..265dc79 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSensorTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index 116bc8a..c3b4cd3 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsUsageStatsTestCases.ctshardware
index 043d135..939c5ed 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsUsageStatsTestCases.ctshardware
@@ -28,7 +28,7 @@
iterations=1,
tag='11_r5.arm.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsViewTestCases.ctshardware
index bd0ee6d..f1df548 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.arm.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsWifiTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsWifiTestCases.ctshardware
index 8892c35..3353110 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsWifiTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsWifiTestCases.ctshardware
@@ -28,7 +28,7 @@
iterations=1,
tag='11_r5.arm.CtsWifiTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.arm.CtsWifiTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWifiTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWifiTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWifiTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.ctshardware
index bace52f..85b3b7e 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsCameraTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--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.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.ctshardware
index 6571768..e608ac6 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsMediaTestCases.ctshardware
@@ -24,7 +24,7 @@
needs_push_media=True,
tag='11_r5.x86.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNativeMediaAAudioTestCases.ctshardware
index 47f459a..2dc456b 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNetTestCases.ctshardware
index 29347d1..606616e 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsNetTestCases.ctshardware
@@ -28,7 +28,7 @@
iterations=1,
tag='11_r5.x86.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsPerfettoTestCases.ctshardware
index 1d8ef94..453d400 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSensorTestCases.ctshardware
index bb59d2d..121e3ee 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSensorTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index aa2b435..f7dc328 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsUsageStatsTestCases.ctshardware
index 6aeb380..e820c8c 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsUsageStatsTestCases.ctshardware
@@ -28,7 +28,7 @@
iterations=1,
tag='11_r5.x86.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsViewTestCases.ctshardware
index f67e7de..44108e0 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='11_r5.x86.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsWifiTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsWifiTestCases.ctshardware
index 87ed55c..b1209de 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsWifiTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsWifiTestCases.ctshardware
@@ -28,7 +28,7 @@
iterations=1,
tag='11_r5.x86.CtsWifiTestCases.ctshardware',
test_name='cheets_CTS_R.11_r5.x86.CtsWifiTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWifiTestCases', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWifiTestCases', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWifiTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.ctshardware
index 3f93e14..1b169b3 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsCameraTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases'],
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.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.ctshardware
index 5763a6b..20c4058 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsMediaTestCases.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='arm.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases'],
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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
index a08842b..5561646 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsNetTestCases.ctshardware
index b3a8e73..49947c6 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsNetTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsPerfettoTestCases.ctshardware
index 48f6b29..469e03f 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsSensorTestCases.ctshardware
index 9ca6610..1be1469 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsSensorTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
index bc9f73e..b688a9c 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsUsageStatsTestCases.ctshardware
index 3035a95..2623483 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsUsageStatsTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsViewTestCases.ctshardware
index 571939d..6020b7b 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsWifiTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.arm.CtsWifiTestCases.ctshardware
index 4bc1a65..be51f8b 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsWifiTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsWifiTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='arm.CtsWifiTestCases.ctshardware',
test_name='cheets_CTS_R.arm.CtsWifiTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWifiTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWifiTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWifiTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.ctshardware
index 430d4d4..30be6aa 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsCameraTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsCameraTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsCameraTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsCameraTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases'],
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.CtsMediaTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.ctshardware
index aa8d199..fa375bf 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsMediaTestCases.ctshardware
@@ -25,7 +25,7 @@
needs_push_media=True,
tag='x86.CtsMediaTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsMediaTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsMediaTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases'],
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.CtsNativeMediaAAudioTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
index 1dae914..e0e4829 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsNativeMediaAAudioTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsNativeMediaAAudioTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsNativeMediaAAudioTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNativeMediaAAudioTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsNetTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsNetTestCases.ctshardware
index 0e168ac..c3c807d 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsNetTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsNetTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsNetTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsNetTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsNetTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsPerfettoTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsPerfettoTestCases.ctshardware
index 5fed5cf..e74c9fb 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsPerfettoTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsPerfettoTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsPerfettoTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsPerfettoTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsPerfettoTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsSensorTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsSensorTestCases.ctshardware
index b0b181f..6f8ec34 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsSensorTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsSensorTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsSensorTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsSensorTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSensorTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
index da6b74b..aadc69b 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsSustainedPerformanceHostTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsSustainedPerformanceHostTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsSustainedPerformanceHostTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsSustainedPerformanceHostTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsUsageStatsTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsUsageStatsTestCases.ctshardware
index 83d4fa7..02510e7 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsUsageStatsTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsUsageStatsTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsUsageStatsTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsUsageStatsTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsUsageStatsTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsViewTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsViewTestCases.ctshardware
index 4d3731b..8a8c539 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsViewTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsViewTestCases.ctshardware
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsViewTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsViewTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsViewTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsWifiTestCases.ctshardware b/server/site_tests/cheets_CTS_R/control.x86.CtsWifiTestCases.ctshardware
index 11ad42f..b6f3170 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsWifiTestCases.ctshardware
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsWifiTestCases.ctshardware
@@ -24,7 +24,7 @@
iterations=1,
tag='x86.CtsWifiTestCases.ctshardware',
test_name='cheets_CTS_R.x86.CtsWifiTestCases.ctshardware',
- run_template=['run', 'commandAndExit', 'cts', '--module', 'CtsWifiTestCases'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWifiTestCases'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWifiTestCases',
target_plan=None,
