Fixing Deqp prerequisite test name for cts-hardware suite
BUG=b:198384191
TEST=generate_controlfiles_CTS_(P|R).py
Change-Id: Iebe268392e536b6e95eaa9c35651f873bd2bfd0a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3160277
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Jaydeep Mehta <jaydeepmehta@google.com>
Commit-Queue: Jaydeep Mehta <jaydeepmehta@google.com>
Tested-by: Jaydeep Mehta <jaydeepmehta@google.com>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_P.py b/server/cros/tradefed/generate_controlfiles_CTS_P.py
index a05316d..038f0c4 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_P.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_P.py
@@ -413,7 +413,7 @@
],
'CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite': [
'--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases',
- '--test', 'dEQP-GLES3.functional.prerequisite.*'
+ '--test', 'dEQP-GLES3.functional.prerequisite#*'
],
'CtsDeqpTestCases.dEQP-GLES31': [
'--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases',
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index ec76316..47d70fb 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -373,7 +373,7 @@
'CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite': [
'--include-filter', 'CtsDeqpTestCases', '--module',
'CtsDeqpTestCases', '--test',
- 'dEQP-GLES3.functional.prerequisite.*'
+ 'dEQP-GLES3.functional.prerequisite#*'
],
'CtsDeqpTestCases.dEQP-GLES31': [
'--include-filter', 'CtsDeqpTestCases', '--module',
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index 4bcc489..d12691d 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -22,7 +22,7 @@
iterations=1,
tag='9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_P.9.0_r17.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- 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', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index 01bbfbb..17074c8 100644
--- a/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_P/control.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -22,7 +22,7 @@
iterations=1,
tag='9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_P.9.0_r17.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- 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', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure', '--dynamic-config-url='],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}', '--dynamic-config-url='],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index 4f04615..0f1fe78 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_P.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite.*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index c6c3dd9..6886358 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_P.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite.*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index 4128902..28abe8a 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -22,7 +22,7 @@
iterations=1,
tag='11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_R.11_r5.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- 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', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index 52e0e7b..3bf6ba4 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_R/control.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -22,7 +22,7 @@
iterations=1,
tag='11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_R.11_r5.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- 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', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index 0b3b058..340ef49 100644
--- a/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_R/control.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -23,7 +23,7 @@
iterations=1,
tag='arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_R.arm.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite.*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite b/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
index ddd3f7f..8c03bbd 100644
--- a/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
+++ b/server/site_tests/cheets_CTS_R/control.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite
@@ -23,7 +23,7 @@
iterations=1,
tag='x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
test_name='cheets_CTS_R.x86.CtsDeqpTestCases.dEQP-GLES3.functional.prerequisite',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite.*'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--module', 'CtsDeqpTestCases', '--test', 'dEQP-GLES3.functional.prerequisite#*'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
