rename test modules based on the VTS naming convention
Test: run vts-kernel
Bug: 75325573
Merged-In: I32521a37f4956b0865adfd0669a9c6836c40c23c
Change-Id: I32521a37f4956b0865adfd0669a9c6836c40c23c
(cherry picked from commit 6d965b95926f2aadb694419aa584cbeadf173ccc)
diff --git a/api/early_mount/Android.mk b/api/early_mount/Android.mk
index b8c95f2..06fd352 100644
--- a/api/early_mount/Android.mk
+++ b/api/early_mount/Android.mk
@@ -18,5 +18,5 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := VtsDeviceTreeEarlyMountTest
+LOCAL_MODULE := VtsKernelDeviceTreeEarlyMount
-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/early_mount/AndroidTest.xml b/api/early_mount/AndroidTest.xml
index ddee728..ea5cf10 100644
--- a/api/early_mount/AndroidTest.xml
+++ b/api/early_mount/AndroidTest.xml
@@ -20,7 +20,7 @@
<option name="push-group" value="VtsDriverShell.push"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="VtsDeviceTreeEarlyMountTest"/>
+ <option name="test-module-name" value="VtsKernelDeviceTreeEarlyMount"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/dt_early_mount_test/dt_early_mount_test" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/dt_early_mount_test/dt_early_mount_test" />
<option name="binary-test-type" value="binary_test"/>
diff --git a/api/proc/Android.mk b/api/proc/Android.mk
index 947fcd8..7b9068c 100644
--- a/api/proc/Android.mk
+++ b/api/proc/Android.mk
@@ -18,6 +18,6 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := KernelProcFileApiTest
+LOCAL_MODULE := VtsKernelProcFileApi
VTS_CONFIG_SRC_DIR := testcases/kernel/api/proc
-include test/vts/tools/build/Android.host_config.mk
diff --git a/api/proc/AndroidTest.xml b/api/proc/AndroidTest.xml
index 423c06f..0802dbe 100644
--- a/api/proc/AndroidTest.xml
+++ b/api/proc/AndroidTest.xml
@@ -23,7 +23,7 @@
<option name="dep-module" value="ply" />
</multi_target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="KernelProcFileApiTest" />
- <option name="test-case-path" value="vts/testcases/kernel/api/proc/KernelProcFileApiTest" />
+ <option name="test-module-name" value="VtsKernelProcFileApi" />
+ <option name="test-case-path" value="vts/testcases/kernel/api/proc/VtsKernelProcFileApiTest" />
</test>
</configuration>
diff --git a/api/proc/KernelProcFileApiTest.py b/api/proc/VtsKernelProcFileApiTest.py
similarity index 99%
rename from api/proc/KernelProcFileApiTest.py
rename to api/proc/VtsKernelProcFileApiTest.py
index 77bde64..1b44a78 100644
--- a/api/proc/KernelProcFileApiTest.py
+++ b/api/proc/VtsKernelProcFileApiTest.py
@@ -116,7 +116,7 @@
}
-class KernelProcFileApiTest(base_test.BaseTestClass):
+class VtsKernelProcFileApiTest(base_test.BaseTestClass):
"""Test cases which check content of proc files.
Attributes:
diff --git a/syscall/Android.mk b/syscall/Android.mk
index a8cdd65..48f8106 100644
--- a/syscall/Android.mk
+++ b/syscall/Android.mk
@@ -39,7 +39,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := SyscallExistenceTest
+LOCAL_MODULE := VtsKernelSyscallExistence
VTS_CONFIG_SRC_DIR := testcases/kernel/syscall
-include test/vts/tools/build/Android.host_config.mk
diff --git a/syscall/AndroidTest.xml b/syscall/AndroidTest.xml
index a855d84..4e5d77b 100644
--- a/syscall/AndroidTest.xml
+++ b/syscall/AndroidTest.xml
@@ -21,7 +21,7 @@
<option name="push" value="DATA/bin/vts_test_binary_syscall_exists->/data/local/tmp/64/vts_test_binary_syscall_exists" />
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
- <option name="test-module-name" value="SyscallExistenceTest" />
+ <option name="test-module-name" value="VtsKernelSyscallExistence" />
<option name="test-case-path" value="vts/testcases/kernel/syscall/SyscallExistenceTest" />
</test>
</configuration>
diff --git a/syscall/SyscallExistenceTest.py b/syscall/VtsKernelSyscallExistenceTest.py
similarity index 98%
rename from syscall/SyscallExistenceTest.py
rename to syscall/VtsKernelSyscallExistenceTest.py
index 9952e40..ce4f3ee 100644
--- a/syscall/SyscallExistenceTest.py
+++ b/syscall/VtsKernelSyscallExistenceTest.py
@@ -24,7 +24,7 @@
from vts.utils.python.controllers import android_device
-class SyscallExistenceTest(base_test.BaseTestClass):
+class VtsKernelSyscallExistenceTest(base_test.BaseTestClass):
"""Tests to verify kernel syscall interface."""
TEST_SHELL_NAME = "my_shell1"
