rename ltp and selftest tests
Bug: 35882166
Change-Id: I65c7899c127fb3277031912edaf75bb0dd1ddfaf
(cherry picked from commit e7dbaabb699a3dfad1dea5a5ce5d0c4d3eb54864)
diff --git a/linux_kselftest/presubmit/Android.mk b/linux_kselftest/presubmit/Android.mk
index 949462b..5717788 100644
--- a/linux_kselftest/presubmit/Android.mk
+++ b/linux_kselftest/presubmit/Android.mk
@@ -20,6 +20,6 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := LinuxKselftestTestPresubmit
+LOCAL_MODULE := VtsKernelLinuxKselftestPresubmit
VTS_CONFIG_SRC_DIR := testcases/kernel/linux_kselftest/presubmit
include test/vts/tools/build/Android.host_config.mk
diff --git a/linux_kselftest/presubmit/AndroidTest.xml b/linux_kselftest/presubmit/AndroidTest.xml
index c848354..cb3a5e4 100644
--- a/linux_kselftest/presubmit/AndroidTest.xml
+++ b/linux_kselftest/presubmit/AndroidTest.xml
@@ -21,7 +21,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="LinuxKselftestTestPresubmit" />
+ <option name="test-module-name" value="VtsKernelLinuxKselftestPresubmit" />
<option name="test-case-path" value="vts/testcases/kernel/linux_kselftest/LinuxKselftestTest" />
<option name="test-config-path" value="vts/testcases/kernel/linux_kselftest/presubmit/LinuxKselftestTestPresubmit.config" />
</test>
diff --git a/linux_kselftest/stable/Android.mk b/linux_kselftest/stable/Android.mk
index b8b7118..03f25bd 100644
--- a/linux_kselftest/stable/Android.mk
+++ b/linux_kselftest/stable/Android.mk
@@ -20,6 +20,6 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := LinuxKselftestTest
+LOCAL_MODULE := VtsKernelLinuxKselftest
VTS_CONFIG_SRC_DIR := testcases/kernel/linux_kselftest/stable
include test/vts/tools/build/Android.host_config.mk
diff --git a/linux_kselftest/stable/AndroidTest.xml b/linux_kselftest/stable/AndroidTest.xml
index ba0a441..b18d054 100644
--- a/linux_kselftest/stable/AndroidTest.xml
+++ b/linux_kselftest/stable/AndroidTest.xml
@@ -21,7 +21,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="LinuxKselftestTest" />
+ <option name="test-module-name" value="VtsKernelLinuxKselftest" />
<option name="test-case-path" value="vts/testcases/kernel/linux_kselftest/LinuxKselftestTest" />
<option name="test-config-path" value="vts/testcases/kernel/linux_kselftest/stable/LinuxKselftestTest.config" />
</test>
diff --git a/linux_kselftest/staging/Android.mk b/linux_kselftest/staging/Android.mk
index 3a15fc7..9dec40e 100644
--- a/linux_kselftest/staging/Android.mk
+++ b/linux_kselftest/staging/Android.mk
@@ -20,6 +20,6 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := LinuxKselftestTestStaging
+LOCAL_MODULE := VtsKernelLinuxKselftestStaging
VTS_CONFIG_SRC_DIR := testcases/kernel/linux_kselftest/staging
include test/vts/tools/build/Android.host_config.mk
diff --git a/linux_kselftest/staging/AndroidTest.xml b/linux_kselftest/staging/AndroidTest.xml
index 86d09bc..da39396 100644
--- a/linux_kselftest/staging/AndroidTest.xml
+++ b/linux_kselftest/staging/AndroidTest.xml
@@ -21,7 +21,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="LinuxKselftestTestStaging" />
+ <option name="test-module-name" value="VtsKernelLinuxKselftestStaging" />
<option name="test-case-path" value="vts/testcases/kernel/linux_kselftest/LinuxKselftestTest" />
<option name="test-config-path" value="vts/testcases/kernel/linux_kselftest/staging/LinuxKselftestTestStaging.config" />
</test>
diff --git a/ltp/stable/Android.mk b/ltp/stable/Android.mk
index fcbebf7..28d799b 100644
--- a/ltp/stable/Android.mk
+++ b/ltp/stable/Android.mk
@@ -18,6 +18,6 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := KernelLtpTest
+LOCAL_MODULE := VtsKernelLtp
VTS_CONFIG_SRC_DIR := testcases/kernel/ltp/stable
include test/vts/tools/build/Android.host_config.mk
diff --git a/ltp/stable/AndroidTest.xml b/ltp/stable/AndroidTest.xml
index 8a9f025..da64a7f 100644
--- a/ltp/stable/AndroidTest.xml
+++ b/ltp/stable/AndroidTest.xml
@@ -20,7 +20,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="KernelLtpTest" />
+ <option name="test-module-name" value="VtsKernelLtp" />
<option name="test-timeout" value="3h" />
<option name="runtime-hint" value="1h" />
<option name="test-case-path" value="vts/testcases/kernel/ltp/KernelLtpTest" />
diff --git a/ltp/staging/Android.mk b/ltp/staging/Android.mk
index 0c1d7bf..d510c3b 100644
--- a/ltp/staging/Android.mk
+++ b/ltp/staging/Android.mk
@@ -18,6 +18,6 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := KernelLtpStagingTest
+LOCAL_MODULE := VtsKernelLtpStaging
VTS_CONFIG_SRC_DIR := testcases/kernel/ltp/staging
include test/vts/tools/build/Android.host_config.mk
diff --git a/ltp/staging/AndroidTest.xml b/ltp/staging/AndroidTest.xml
index a623ebc..b31c739 100644
--- a/ltp/staging/AndroidTest.xml
+++ b/ltp/staging/AndroidTest.xml
@@ -20,7 +20,7 @@
<target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer">
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="KernelLtpStagingTest" />
+ <option name="test-module-name" value="VtsKernelLtpStaging" />
<option name="test-timeout" value="3h30m" />
<option name="runtime-hint" value="1h30m" />
<option name="test-case-path" value="vts/testcases/kernel/ltp/KernelLtpTest" />
