Add metadata to modules in test/vts-testcase/security
Add metadata. key="plan"; value="vts-staging-kernel" or "vts-security".
Fix module name of VtsSecuritySelinuxPolicyHost.
Test: vts-tradefed run commandAndExit vts --include-filter VtsHalBootV1_0Target
Bug: 70485967
Change-Id: I7dbff86eb43dd065113ef4d2c42dbfd14c771927
Merged-In: I7dbff86eb43dd065113ef4d2c42dbfd14c771927
(cherry picked from commit b44ae4eee778701c9a977febf7c262b5d6fc18a2)
diff --git a/poc/config/stable/AndroidTest.xml b/poc/config/stable/AndroidTest.xml
index 7a31353..f5400af 100644
--- a/poc/config/stable/AndroidTest.xml
+++ b/poc/config/stable/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for VTS kernel security PoC test cases">
+ <option name="config-descriptor:metadata" key="plan" value="vts-security" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
diff --git a/poc/config/staging/AndroidTest.xml b/poc/config/staging/AndroidTest.xml
index 14cf0e2..79d2119 100644
--- a/poc/config/staging/AndroidTest.xml
+++ b/poc/config/staging/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for VTS kernel security PoC test cases">
+ <option name="config-descriptor:metadata" key="plan" value="vts-staging-kernel" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="push-group" value="HostDrivenTest.push" />
<option name="cleanup" value="true" />
diff --git a/selinux/policy/AndroidTest.xml b/selinux/policy/AndroidTest.xml
index 8c09341..9f943e3 100644
--- a/selinux/policy/AndroidTest.xml
+++ b/selinux/policy/AndroidTest.xml
@@ -14,9 +14,10 @@
limitations under the License.
-->
<configuration description="Config for VTS Security SELinux policy host-side test cases">
+ <option name="config-descriptor:metadata" key="plan" value="vts-security" />
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer"/>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsHalRadioV1_0TargetProfiling"/>
+ <option name="test-module-name" value="VtsSecuritySelinuxPolicyHost"/>
<option name="binary-test-source" value="out/host/linux-x86/bin/VtsSecuritySelinuxPolicyHostTest" />
<option name="binary-test-type" value="host_binary_test"/>
<option name="test-timeout" value="1m"/>
