Rename VTS to VTS10 am: 0d90e1dfcd am: 728f302ccd am: 384e92d97c am: d826858be7
Bug: 151896491
Test: none
Change-Id: I1d5f43aec02f3232d4233bbcf436121d00ba9643
Merged-In: I9cd76246887622f5a541be38d4b53b8857ee3ade
Merged-In: I1d5f43aec02f3232d4233bbcf436121d00ba9643
(cherry picked from commit e88b1235f7bcc11a70f3462e319edb928666d16d)
diff --git a/doc/developer_testing/kernel/run_all_ltp_testcases.md b/doc/developer_testing/kernel/run_all_ltp_testcases.md
index 7fb79a3..e57943b 100644
--- a/doc/developer_testing/kernel/run_all_ltp_testcases.md
+++ b/doc/developer_testing/kernel/run_all_ltp_testcases.md
@@ -2,8 +2,8 @@
## 1. Compile VTS and LTP source code
`$ make vts -j12`
-## 2. Start VTS-TradeFed
-`$ vts-tradefed`
+## 2. Start VTS10-TradeFed
+`$ vts10-tradefed`
## 3. Run kernel LTP test from VTS-TradeFed console
`> run vts-kernel`
diff --git a/doc/developer_testing/kernel/run_individual_ltp_testcase.md b/doc/developer_testing/kernel/run_individual_ltp_testcase.md
index 83c9a3b..596d66c 100644
--- a/doc/developer_testing/kernel/run_individual_ltp_testcase.md
+++ b/doc/developer_testing/kernel/run_individual_ltp_testcase.md
@@ -2,8 +2,8 @@
## 1. Compile VTS and LTP source code
`$ make vts -j12`
-## 2. Start VTS-TradeFed
-`$ vts-tradefed`
+## 2. Start VTS10-TradeFed
+`$ vts10-tradefed`
## 3. Run individual LTP test from VTS-TradeFed console
`> run vts-kernel -m VtsKernelLtp -t <testname1,testname2,...>`
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 0aba7c9..fab654c 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -79,44 +79,44 @@
For Linux users,
-`$ vts-tradefed`
+`$ vts10-tradefed`
-`> run vts`
+`> run vts10`
For Windows users, please build on Linux. Then copy the following zip file to Windows and extract it.
-`out/host/linux-x86/vts/android-vts.zip`
+`out/host/linux-x86/vts10/android-vts10.zip`
Launch the batch file in the extracted folder.
-`$ android-vts\tools\vts-tradefed_win.bat`
+`$ android-vts10\tools\vts10-tradefed_win.bat`
-`> run vts`
+`> run vts10`
Example stdout:
```
…
…
-08-16 09:36:03 I/ResultReporter: Saved logs for device_logcat in .../out/host/linux-x86/vts/android-vts/logs/2016.08.16_09.17.13/device_logcat_7912321856562095748.zip
-08-16 09:36:03 I/ResultReporter: Saved logs for host_log in .../out/host/linux-x86/vts/android-vts/logs/2016.08.16_09.17.13/host_log_2775945280523850018.zip
+08-16 09:36:03 I/ResultReporter: Saved logs for device_logcat in .../out/host/linux-x86/vts10/android-vts10/logs/2016.08.16_09.17.13/device_logcat_7912321856562095748.zip
+08-16 09:36:03 I/ResultReporter: Saved logs for host_log in .../out/host/linux-x86/vts10/android-vts10/logs/2016.08.16_09.17.13/host_log_2775945280523850018.zip
08-16 09:36:04 I/ResultReporter: Invocation finished in 18m 50s. PASSED: 18, FAILED: 0, NOT EXECUTED: 2, MODULES: 8 of 10
-08-16 09:36:04 I/ResultReporter: Test Result: .../out/host/linux-x86/vts/android-vts/results/2016.08.16_09.17.13/test_result.xml
-08-16 09:36:04 I/ResultReporter: Full Result: .../out/host/linux-x86/vts/android-vts/results/2016.08.16_09.17.13.zip
+08-16 09:36:04 I/ResultReporter: Test Result: .../out/host/linux-x86/vts10/android-vts10/results/2016.08.16_09.17.13/test_result.xml
+08-16 09:36:04 I/ResultReporter: Full Result: .../out/host/linux-x86/vts10/android-vts10/results/2016.08.16_09.17.13.zip
```
### 2.2. Test report for APFE (Android Partner Front-End)
The uploadable report xml file can be found at
-`out/host/linux-x86/vts/android-vts/results/`
+`out/host/linux-x86/vts10/android-vts10/results/`
After Android O release, you will be able to upload that xml file to [AFPE](https://partner.android.com)
and obtain a certificate.
### 2.3. Check the test logs
-`$ vi out/host/linux-x86/vts/android-vts/logs/`
+`$ vi out/host/linux-x86/vts10/android-vts10/logs/`
Then select a directory which captures the time stamp of your test run (e.g., 2016.08.16_09.17.13).
@@ -126,7 +126,7 @@
## 3. Run Options for Advanced Users
-### 3.1. List of VTS Plans
+### 3.1. List of VTS10 Plans
Documented at [here](../tools/vts-tradefed/res/config/plans.md).
diff --git a/harnesses/tradefed/Android.bp b/harnesses/tradefed/Android.bp
index 328344d..83c42dd 100644
--- a/harnesses/tradefed/Android.bp
+++ b/harnesses/tradefed/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
java_library_host {
- name: "vts-tradefed-harness",
+ name: "vts10-tradefed-harness",
srcs: ["src/**/*.java"],
libs: [
"tradefed",
diff --git a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
index 4fccfe8..f7a579c 100644
--- a/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
+++ b/harnesses/tradefed/src/com/android/tradefed/testtype/VtsMultiDeviceTest.java
@@ -63,7 +63,7 @@
import org.json.JSONObject;
/**
- * A Test that runs a vts multi device test package (part of Vendor Test Suite, VTS) on given
+ * A Test that runs a vts multi device test package (part of Vendor Test Suite, VTS10) on given
* device.<p>
* TODO: Complete unit tests
*/
@@ -516,7 +516,7 @@
private IBuildInfo mBuildInfo = null;
private String mRunName = null;
- // the path to android-vts/testcases
+ // the path to android-vts10/testcases
private String mTestCaseDir = "./";
private VtsVendorConfigFileUtil configReader = null;
@@ -1496,7 +1496,7 @@
}
/**
- * Set the path for android-vts/testcases/ which keeps the VTS python code under vts.
+ * Set the path for android-vts10/testcases/ which keeps the VTS python code under vts.
*/
private void setTestCaseDir() {
try {
diff --git a/harnesses/tradefed/tests/Android.bp b/harnesses/tradefed/tests/Android.bp
index 2760b38..5e819f7 100644
--- a/harnesses/tradefed/tests/Android.bp
+++ b/harnesses/tradefed/tests/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
java_library_host {
- name: "vts-tradefed-tests",
+ name: "vts10-tradefed-tests",
srcs: ["src/**/*.java"],
@@ -24,7 +24,7 @@
],
libs: [
"tradefed",
- "vts-tradefed",
+ "vts10-tradefed",
],
java_resource_dirs: ["res"],
}
diff --git a/harnesses/tradefed/tests/src/com/android/tradefed/presubmit/VtsConfigLoadingTest.java b/harnesses/tradefed/tests/src/com/android/tradefed/presubmit/VtsConfigLoadingTest.java
index f5b2fb3..b496dd8 100644
--- a/harnesses/tradefed/tests/src/com/android/tradefed/presubmit/VtsConfigLoadingTest.java
+++ b/harnesses/tradefed/tests/src/com/android/tradefed/presubmit/VtsConfigLoadingTest.java
@@ -35,12 +35,12 @@
import java.util.Set;
/**
- * Test that configuration in VTS can load and have expected properties.
+ * Test that configuration in VTS10 can load and have expected properties.
*/
@RunWith(JUnit4.class)
public class VtsConfigLoadingTest {
/**
- * List of the officially supported runners in VTS.
+ * List of the officially supported runners in VTS10.
*/
private static final Set<String> SUPPORTED_VTS_TEST_TYPE = new HashSet<>(Arrays.asList(
"com.android.compatibility.common.tradefed.testtype.JarHostTest",
@@ -53,8 +53,8 @@
*/
@Test
public void testConfigurationLoad() throws Exception {
- String vtsRoot = System.getProperty("VTS_ROOT");
- File testcases = new File(vtsRoot, "/android-vts/testcases/");
+ String vtsRoot = System.getProperty("VTS10_ROOT");
+ File testcases = new File(vtsRoot, "/android-vts10/testcases/");
if (!testcases.exists()) {
fail(String.format("%s does not exists", testcases));
return;
@@ -77,7 +77,7 @@
// Check that all the tests runners are well supported.
if (!SUPPORTED_VTS_TEST_TYPE.contains(test.getClass().getCanonicalName())) {
throw new ConfigurationException(
- String.format("testtype %s is not officially supported by VTS.",
+ String.format("testtype %s is not officially supported by VTS10.",
test.getClass().getCanonicalName()));
}
}
diff --git a/harnesses/tradefed/tests/src/com/android/tradefed/testtype/VtsMultiDeviceTestTest.java b/harnesses/tradefed/tests/src/com/android/tradefed/testtype/VtsMultiDeviceTestTest.java
index 288ee03..d82799f 100644
--- a/harnesses/tradefed/tests/src/com/android/tradefed/testtype/VtsMultiDeviceTestTest.java
+++ b/harnesses/tradefed/tests/src/com/android/tradefed/testtype/VtsMultiDeviceTestTest.java
@@ -54,7 +54,7 @@
* The working directory is assumed to be
* test/
* which contains the same config as the build output
- * out/host/linux-x86/vts/android-vts/testcases/
+ * out/host/linux-x86/vts10/android-vts10/testcases/
*/
@RunWith(JUnit4.class)
public class VtsMultiDeviceTestTest {
diff --git a/tools/build/Android.host_config.mk b/tools/build/Android.host_config.mk
index 38ba19d..3a71464 100644
--- a/tools/build/Android.host_config.mk
+++ b/tools/build/Android.host_config.mk
@@ -16,11 +16,11 @@
LOCAL_MODULE_CLASS := FAKE
LOCAL_IS_HOST_MODULE := true
-LOCAL_COMPATIBILITY_SUITE := vts
+LOCAL_COMPATIBILITY_SUITE := vts10
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE):
- @echo "VTS host-driven test target: $(PRIVATE_MODULE)"
+ @echo "VTS10 host-driven test target: $(PRIVATE_MODULE)"
$(hide) touch $@
diff --git a/tools/build/Android.host_config_vts_only.mk b/tools/build/Android.host_config_vts_only.mk
index bebeb27..3a2a8f6 100644
--- a/tools/build/Android.host_config_vts_only.mk
+++ b/tools/build/Android.host_config_vts_only.mk
@@ -14,14 +14,14 @@
# limitations under the License.
#
-# Please use this when your VTS module can't be part of general-tests.
+# Please use this when your VTS10 module can't be part of general-tests.
LOCAL_MODULE_CLASS := FAKE
LOCAL_IS_HOST_MODULE := true
-LOCAL_COMPATIBILITY_SUITE := vts
+LOCAL_COMPATIBILITY_SUITE := vts10
include $(BUILD_SYSTEM)/base_rules.mk
$(LOCAL_BUILT_MODULE):
- @echo "VTS host-driven test target: $(PRIVATE_MODULE)"
+ @echo "VTS10 host-driven test target: $(PRIVATE_MODULE)"
$(hide) touch $@
diff --git a/tools/build/tasks/framework/vtf_package.mk b/tools/build/tasks/framework/vtf_package.mk
index 6a3ab5f..0f69226 100644
--- a/tools/build/tasks/framework/vtf_package.mk
+++ b/tools/build/tasks/framework/vtf_package.mk
@@ -51,7 +51,7 @@
$(call host-native-copy-pairs,$(target_hostdriven_modules),$(VTF_TESTCASES_OUT))
host_additional_deps_copy_pairs := \
- test/vts/tools/vts-tradefed/etc/vts-tradefed_win.bat:$(VTF_TOOLS_OUT)/vts-tradefed_win.bat \
+ test/vts/tools/vts-tradefed/etc/vts10-tradefed_win.bat:$(VTF_TOOLS_OUT)/vts10-tradefed_win.bat \
test/vts/tools/vts-tradefed/DynamicConfig.xml:$(VTF_TESTCASES_OUT)/cts.dynamic
# Packaging rule for host-side Python logic, configs, and data files
diff --git a/tools/build/tasks/framework/vts_for_core_suite.mk b/tools/build/tasks/framework/vts_for_core_suite.mk
index ee3c348..9d39903 100644
--- a/tools/build/tasks/framework/vts_for_core_suite.mk
+++ b/tools/build/tasks/framework/vts_for_core_suite.mk
@@ -36,9 +36,9 @@
vts_target_native_copy_pairs := \
$(call target-native-copy-pairs,$(vts_target_native_modules),$(VTS_CORE_TESTCASES_OUT))
-# Package vts-tradefed jars
-test_suite_tools += $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar \
- $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed-tests.jar
+# Package vts10-tradefed jars
+test_suite_tools += $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed.jar \
+ $(HOST_OUT_JAVA_LIBRARIES)/vts10-tradefed-tests.jar
# Packaging rule for host-side Python logic, configs, and data files
host_framework_files := \
diff --git a/tools/build/tasks/list/vts_apk_package_list.mk b/tools/build/tasks/list/vts_apk_package_list.mk
index 032224c..b99f88e 100644
--- a/tools/build/tasks/list/vts_apk_package_list.mk
+++ b/tools/build/tasks/list/vts_apk_package_list.mk
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# APKs used by VTS framework.
+# APKs used by VTS10 framework.
vts_apk_packages := \
VtsAgentApp \
CtsVerifier \
@@ -21,7 +21,7 @@
VtsHalNeuralnetworksV1_2BenchmarkTestCases \
VtsHalNeuralnetworksV1_3BenchmarkTestCases \
-# Other tests APKs included as part of VTS.
+# Other tests APKs included as part of VTS10.
vts_apk_packages += \
DeviceHealthTests
diff --git a/tools/build/tasks/list/vts_bin_package_list.mk b/tools/build/tasks/list/vts_bin_package_list.mk
index 86e6808..b99b600 100644
--- a/tools/build/tasks/list/vts_bin_package_list.mk
+++ b/tools/build/tasks/list/vts_bin_package_list.mk
@@ -22,6 +22,6 @@
vts_coverage_configure \
vts_testability_checker \
-# Extra apk utils for VTS framework.
+# Extra apk utils for VTS10 framework.
vts_bin_packages += \
WifiUtil \
diff --git a/tools/build/tasks/list/vts_test_host_bin_package_list.mk b/tools/build/tasks/list/vts_test_host_bin_package_list.mk
index 016eaa1..931e281 100644
--- a/tools/build/tasks/list/vts_test_host_bin_package_list.mk
+++ b/tools/build/tasks/list/vts_test_host_bin_package_list.mk
@@ -4,7 +4,7 @@
simg2img \
mkuserimg_mke2fs
-# Need to package mkdtboimg.py since the tool is not just used by the VTS test.
+# Need to package mkdtboimg.py since the tool is not just used by the VTS10 test.
vts_test_host_bin_packages += \
mkdtboimg.py \
fuzzy_fastboot \
diff --git a/tools/build/tasks/vts_package.mk b/tools/build/tasks/vts_package.mk
index 998c301..3dd094d 100644
--- a/tools/build/tasks/vts_package.mk
+++ b/tools/build/tasks/vts_package.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-# Build rules for VTS (Vendor Test Suite) that includes VTF and tests.
+# Build rules for VTS10 (Vendor Test Suite) that includes VTF and tests.
LOCAL_PATH := $(call my-dir)
@@ -37,12 +37,15 @@
-include external/linux-kselftest/android/kselftest_test_list.mk
-include external/ltp/android/ltp_package_list.mk
-VTS_OUT_ROOT := $(HOST_OUT)/vts
-VTS_TESTCASES_OUT := $(VTS_OUT_ROOT)/android-vts/testcases
+VTS10_OUT_ROOT := $(HOST_OUT)/vts10
+VTS10_TESTCASES_OUT := $(VTS10_OUT_ROOT)/android-vts10/testcases
+# TODO(b/151896491): Remove these 2 variable after internal master is updated.
+VTS_OUT_ROOT := $(VTS10_OUT_ROOT)
+VTS_TESTCASES_OUT := $(VTS10_TESTCASES_OUT)
-# Packaging rule for android-vts.zip
-test_suite_name := vts
-test_suite_tradefed := vts-tradefed
+# Packaging rule for android-vts10.zip
+test_suite_name := vts10
+test_suite_tradefed := vts10-tradefed
test_suite_readme := test/vts/README.md
# Package vts-core libraries.
test_suite_tools += $(HOST_OUT_JAVA_LIBRARIES)/vts-core-tradefed-harness.jar \
@@ -50,16 +53,15 @@
include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
-.PHONY: vts
-vts: $(compatibility_zip) vtslab adb
-
-# Add a phony target to preparer vts to be renamed to vts10
.PHONY: vts10
-vts10: vts
+vts10: $(compatibility_zip) vtslab adb
+$(call dist-for-goals, vts10, $(compatibility_zip))
-$(call dist-for-goals, vts vts10, $(compatibility_zip))
+# Keep the old PHONY target until it's removed from all build configs.
+.PHONY: vts
+vts: vts10
-# Packaging rule for android-vts.zip's testcases dir (DATA subdir).
+# Packaging rule for android-vts10.zip's testcases dir (DATA subdir).
target_native_modules := \
$(kselftest_modules) \
ltp \
@@ -71,9 +73,9 @@
$(vts_func_fuzzer_packages) \
target_native_copy_pairs := \
- $(call target-native-copy-pairs,$(target_native_modules),$(VTS_TESTCASES_OUT))
+ $(call target-native-copy-pairs,$(target_native_modules),$(VTS10_TESTCASES_OUT))
-# Packaging rule for android-vts.zip's testcases dir (spec subdir).
+# Packaging rule for android-vts10.zip's testcases dir (spec subdir).
target_spec_modules := \
$(VTS_SPEC_FILE_LIST)
@@ -87,18 +89,18 @@
$(subst android/system/, system/hardware/interfaces/,$(dir $(m)))))))/vts)\
$(eval my_spec_copy_file := $(notdir $(m)))\
$(eval my_spec_copy_dest := $(my_spec_copy_dir)/$(my_spec_copy_file))\
- $(eval target_spec_copy_pairs += $(m):$(VTS_TESTCASES_OUT)/$(my_spec_copy_dest)))
+ $(eval target_spec_copy_pairs += $(m):$(VTS10_TESTCASES_OUT)/$(my_spec_copy_dest)))
$(foreach m,$(vts_spec_file_list),\
$(if $(wildcard $(m)),\
- $(eval target_spec_copy_pairs += $(m):$(VTS_TESTCASES_OUT)/spec/$(m))))
+ $(eval target_spec_copy_pairs += $(m):$(VTS10_TESTCASES_OUT)/spec/$(m))))
target_trace_files := \
$(call find-files-in-subdirs,test/vts-testcase/hal-trace,"*.vts.trace" -and -type f,.) \
target_trace_copy_pairs := \
$(foreach f,$(target_trace_files),\
- test/vts-testcase/hal-trace/$(f):$(VTS_TESTCASES_OUT)/hal-hidl-trace/test/vts-testcase/hal-trace/$(f))
+ test/vts-testcase/hal-trace/$(f):$(VTS10_TESTCASES_OUT)/hal-hidl-trace/test/vts-testcase/hal-trace/$(f))
target_hal_hash_modules := \
$(vts_test_hidl_hal_hash_list) \
@@ -106,46 +108,46 @@
target_hal_hash_copy_pairs :=
$(foreach m,$(target_hal_hash_modules),\
$(if $(wildcard $(m)),\
- $(eval target_hal_hash_copy_pairs += $(m):$(VTS_TESTCASES_OUT)/hal-hidl-hash/$(m))))
+ $(eval target_hal_hash_copy_pairs += $(m):$(VTS10_TESTCASES_OUT)/hal-hidl-hash/$(m))))
host_vndk_abi_dumps := \
$(foreach target,$(vts_vndk_abi_dump_target_tuple_list),\
- $(call create-vndk-abi-dump-from-target,$(target),$(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden))
+ $(call create-vndk-abi-dump-from-target,$(target),$(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden))
media_test_res_files := \
$(call find-files-in-subdirs,hardware/interfaces/media/res,"*.*" -and -type f,.) \
media_test_res_copy_pairs := \
$(foreach f,$(media_test_res_files),\
- hardware/interfaces/media/res/$(f):$(VTS_TESTCASES_OUT)/DATA/media/res/$(f))
+ hardware/interfaces/media/res/$(f):$(VTS10_TESTCASES_OUT)/DATA/media/res/$(f))
media_c2_test_res_files := \
$(call find-files-in-subdirs,frameworks/av/media/codec2/hidl/1.0/vts/functional/res,"*.*" -and -type f,.) \
media_c2_test_res_copy_pairs := \
$(foreach f,$(media_c2_test_res_files),\
- frameworks/av/media/codec2/hidl/1.0/vts/functional/res/$(f):$(VTS_TESTCASES_OUT)/DATA/media/c2/res/$(f))
+ frameworks/av/media/codec2/hidl/1.0/vts/functional/res/$(f):$(VTS10_TESTCASES_OUT)/DATA/media/c2/res/$(f))
nbu_p2p_apk_files := \
$(call find-files-in-subdirs,test/vts-testcase/nbu/src,"*.apk" -and -type f,.)
nbu_p2p_apk_copy_pairs := \
$(foreach f,$(nbu_p2p_apk_files),\
- test/vts-testcase/nbu/src/$(f):$(VTS_TESTCASES_OUT)/DATA/app/nbu/$(f))
+ test/vts-testcase/nbu/src/$(f):$(VTS10_TESTCASES_OUT)/DATA/app/nbu/$(f))
performance_test_res_files := \
$(call find-files-in-subdirs,test/vts-testcase/performance/res/,"*.*" -and -type f,.) \
performance_test_res_copy_pairs := \
$(foreach f,$(performance_test_res_files),\
- test/vts-testcase/performance/res/$(f):$(VTS_TESTCASES_OUT)/DATA/performance/res/$(f))
+ test/vts-testcase/performance/res/$(f):$(VTS10_TESTCASES_OUT)/DATA/performance/res/$(f))
audio_test_res_files := \
$(call find-files-in-subdirs,hardware/interfaces/audio,"*.xsd" -and -type f,.) \
audio_test_res_copy_pairs := \
$(foreach f,$(audio_test_res_files),\
- hardware/interfaces/audio/$(f):$(VTS_TESTCASES_OUT)/DATA/hardware/interfaces/audio/$(f))
+ hardware/interfaces/audio/$(f):$(VTS10_TESTCASES_OUT)/DATA/hardware/interfaces/audio/$(f))
ifeq (REL,$(PLATFORM_VERSION_CODENAME))
LATEST_VNDK_LIB_EXTRA_LIST := development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-$(PLATFORM_VNDK_VERSION).txt
@@ -154,21 +156,21 @@
endif
vndk_test_res_copy_pairs := \
- $(LATEST_VNDK_LIB_LIST):$(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden/$(PLATFORM_VNDK_VERSION)/vndk-lib-list.txt \
- $(LATEST_VNDK_LIB_EXTRA_LIST):$(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden/$(PLATFORM_VNDK_VERSION)/vndk-lib-extra-list.txt \
- $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),build/make/target/product/gsi/$(vndk_ver).txt:$(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden/$(vndk_ver)/vndk-lib-list.txt) \
- $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-$(vndk_ver).txt:$(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden/$(vndk_ver)/vndk-lib-extra-list.txt) \
+ $(LATEST_VNDK_LIB_LIST):$(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden/$(PLATFORM_VNDK_VERSION)/vndk-lib-list.txt \
+ $(LATEST_VNDK_LIB_EXTRA_LIST):$(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden/$(PLATFORM_VNDK_VERSION)/vndk-lib-extra-list.txt \
+ $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),build/make/target/product/gsi/$(vndk_ver).txt:$(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden/$(vndk_ver)/vndk-lib-list.txt) \
+ $(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),development/vndk/tools/definition-tool/datasets/vndk-lib-extra-list-$(vndk_ver).txt:$(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden/$(vndk_ver)/vndk-lib-extra-list.txt) \
system_property_compatibility_test_res_copy_pairs := \
- system/sepolicy/public/property_contexts:$(VTS_TESTCASES_OUT)/vts/testcases/security/system_property/data/property_contexts
+ system/sepolicy/public/property_contexts:$(VTS10_TESTCASES_OUT)/vts/testcases/security/system_property/data/property_contexts
# For VtsSecurityAvb
gsi_key_copy_pairs := \
- system/core/rootdir/avb/q-gsi.avbpubkey:$(VTS_TESTCASES_OUT)/DATA/avb/q-gsi.avbpubkey \
- system/core/rootdir/avb/r-gsi.avbpubkey:$(VTS_TESTCASES_OUT)/DATA/avb/r-gsi.avbpubkey \
- system/core/rootdir/avb/s-gsi.avbpubkey:$(VTS_TESTCASES_OUT)/DATA/avb/s-gsi.avbpubkey \
+ system/core/rootdir/avb/q-gsi.avbpubkey:$(VTS10_TESTCASES_OUT)/DATA/avb/q-gsi.avbpubkey \
+ system/core/rootdir/avb/r-gsi.avbpubkey:$(VTS10_TESTCASES_OUT)/DATA/avb/r-gsi.avbpubkey \
+ system/core/rootdir/avb/s-gsi.avbpubkey:$(VTS10_TESTCASES_OUT)/DATA/avb/s-gsi.avbpubkey \
-$(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden/platform_vndk_version.txt:
+$(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden/platform_vndk_version.txt:
@echo -n $(PLATFORM_VNDK_VERSION) > $@
# Package roots that contains /prebuilt_hashes, and thus can be analyzed.
@@ -191,22 +193,22 @@
-- $(vts_hidl_hashes) > $@
# for VTF (Vendor Test Framework) packages
-VTF_OUT_ROOT := $(HOST_OUT)/vts
-VTF_TESTCASES_OUT := $(VTF_OUT_ROOT)/android-vts/testcases
-VTF_TOOLS_OUT := $(VTF_OUT_ROOT)/android-vts/tools
+VTF_OUT_ROOT := $(HOST_OUT)/vts10
+VTF_TESTCASES_OUT := $(VTF_OUT_ROOT)/android-vts10/testcases
+VTF_TOOLS_OUT := $(VTF_OUT_ROOT)/android-vts10/tools
VTF_EXTRA_SCRIPTS :=
xsd_config_files := \
- system/libvintf/xsd/compatibilityMatrix/compatibility_matrix.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/compatibility_matrix.xsd \
- system/libvintf/xsd/halManifest/hal_manifest.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/hal_manifest.xsd \
- frameworks/av/media/libstagefright/xmlparser/media_codecs.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/media_codecs.xsd \
- frameworks/av/media/libmedia/xsd/media_profiles.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/media_profiles.xsd \
- frameworks/base/services/core/xsd/default-permissions.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/default-permissions.xsd \
- frameworks/base/core/xsd/permission.xsd:$(VTS_TESTCASES_OUT)/DATA/etc/permission.xsd
+ system/libvintf/xsd/compatibilityMatrix/compatibility_matrix.xsd:$(VTS10_TESTCASES_OUT)/DATA/etc/compatibility_matrix.xsd \
+ system/libvintf/xsd/halManifest/hal_manifest.xsd:$(VTS10_TESTCASES_OUT)/DATA/etc/hal_manifest.xsd \
+ frameworks/av/media/libstagefright/xmlparser/media_codecs.xsd:$(VTS10_TESTCASES_OUT)/DATA/etc/media_codecs.xsd \
+ frameworks/av/media/libmedia/xsd/media_profiles.xsd:$(VTS10_TESTCASES_OUT)/DATA/etc/media_profiles.xsd \
+ frameworks/base/services/core/xsd/default-permissions.xsd:$(VTS10_TESTCASES_OUT)/DATA/etc/default-permissions.xsd \
+ frameworks/base/core/xsd/permission.xsd:$(VTS10_TESTCASES_OUT)/DATA/etc/permission.xsd
include $(LOCAL_PATH)/framework/vtf_package.mk
-# finally back to the rules for VTS (Vendor Test Suite) packages
+# finally back to the rules for VTS10 (Vendor Test Suite) packages
vts_copy_pairs := \
$(vtf_copy_pairs) \
$(vts_test_core_copy_pairs) \
@@ -222,7 +224,7 @@
$(call copy-many-files,$(system_property_compatibility_test_res_copy_pairs)) \
$(call copy-many-files,$(xsd_config_files)) \
$(call copy-many-files,$(gsi_key_copy_pairs)) \
- $(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden/platform_vndk_version.txt \
+ $(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden/platform_vndk_version.txt \
$(vts_hidl_hals_dump) \
$(compatibility_zip): $(vts_copy_pairs) $(host_vndk_abi_dumps)
diff --git a/tools/build/utils/vts_package_utils.mk b/tools/build/utils/vts_package_utils.mk
index 135d8c1..8b77bcb 100644
--- a/tools/build/utils/vts_package_utils.mk
+++ b/tools/build/utils/vts_package_utils.mk
@@ -68,7 +68,7 @@
endef
# $(1): The target tuple. e.g., arm:arm:armv7-a-neon:32
-# $(2): The output directory. e.g., $(VTS_TESTCASES_OUT)/vts/testcases/vndk/golden.
+# $(2): The output directory. e.g., $(VTS10_TESTCASES_OUT)/vts/testcases/vndk/golden.
# Evaluates to a list of destination files. (i.e. suitable for dependency list)
define create-vndk-abi-dump-from-target
$(strip \
diff --git a/tools/vts-core-tradefed/etc/vts-core-tradefed b/tools/vts-core-tradefed/etc/vts-core-tradefed
index d43c080..4dcc037 100755
--- a/tools/vts-core-tradefed/etc/vts-core-tradefed
+++ b/tools/vts-core-tradefed/etc/vts-core-tradefed
@@ -85,7 +85,7 @@
fi;
JAR_DIR=${VTS_CORE_ROOT}/android-vts-core/tools
-# TODO(b/149249068): Remove vts-tradefed* after all VTS tests are converted
+# TODO(b/149249068): Remove vts10-tradefed* after all VTS tests are converted
JARS="tradefed
loganalysis
hosttestlib
@@ -93,8 +93,8 @@
compatibility-host-util-tests
vts-core-tradefed
vts-core-tradefed-tests
- vts-tradefed
- vts-tradefed-tests
+ vts10-tradefed
+ vts10-tradefed-tests
compatibility-common-util-tests
compatibility-tradefed-tests"
diff --git a/tools/vts-tradefed/Android.bp b/tools/vts-tradefed/Android.bp
index a0202d7..114ec19 100644
--- a/tools/vts-tradefed/Android.bp
+++ b/tools/vts-tradefed/Android.bp
@@ -13,17 +13,17 @@
// limitations under the License.
tradefed_binary_host {
- name: "vts-tradefed",
- wrapper: "etc/vts-tradefed",
- short_name: "VTS",
- full_name: "Vendor Test Suite",
+ name: "vts10-tradefed",
+ wrapper: "etc/vts10-tradefed",
+ short_name: "VTS10",
+ full_name: "Vendor Test Suite V10",
version: "10_r1",
static_libs: [
"libvts_protos_host",
"gson-prebuilt-jar",
"google-api-java-client-min-repackaged",
"cts-tradefed-harness",
- "vts-tradefed-harness",
+ "vts10-tradefed-harness",
],
libs: ["vts-core-tradefed-harness"],
manifest: "MANIFEST.mf",
diff --git a/tools/vts-tradefed/build/config.mk b/tools/vts-tradefed/build/config.mk
index a17c459..312eda9 100644
--- a/tools/vts-tradefed/build/config.mk
+++ b/tools/vts-tradefed/build/config.mk
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-COMPATIBILITY_TESTCASES_OUT_vts := $(HOST_OUT)/vts/android-vts/testcases
+COMPATIBILITY_TESTCASES_OUT_vts10 := $(HOST_OUT)/vts10/android-vts10/testcases
diff --git a/tools/vts-tradefed/etc/Android.bp b/tools/vts-tradefed/etc/Android.bp
index d68ffba..859b28e 100644
--- a/tools/vts-tradefed/etc/Android.bp
+++ b/tools/vts-tradefed/etc/Android.bp
@@ -18,8 +18,8 @@
}
sh_binary_host {
- name: "vts-tradefed_win",
- src: "vts-tradefed_win.bat",
+ name: "vts10-tradefed_win",
+ src: "vts10-tradefed_win.bat",
filename_from_src: true,
target: {
diff --git a/tools/vts-tradefed/etc/Android.mk b/tools/vts-tradefed/etc/Android.mk
index b150a32..97dbda6 100644
--- a/tools/vts-tradefed/etc/Android.mk
+++ b/tools/vts-tradefed/etc/Android.mk
@@ -12,5 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-.PHONY: vts-tradefed-standalone
-vts-tradefed-standalone: vts-tradefed vts-tradefed-tests loganalysis hosttestlib compatibility-host-util tradefed vts-core-tradefed
+.PHONY: vts10-tradefed-standalone
+vts10-tradefed-standalone: vts10-tradefed vts10-tradefed-tests loganalysis hosttestlib compatibility-host-util tradefed vts-core-tradefed
diff --git a/tools/vts-tradefed/etc/vtf b/tools/vts-tradefed/etc/vtf
index fbe0685..c4555f8 100755
--- a/tools/vts-tradefed/etc/vtf
+++ b/tools/vts-tradefed/etc/vtf
@@ -1,2 +1,2 @@
-VTF_BUILD_TARGET_NAME=vtf vts-tradefed
+VTF_BUILD_TARGET_NAME=vtf vts10-tradefed
diff --git a/tools/vts-tradefed/etc/vts-gce-tradefed b/tools/vts-tradefed/etc/vts10-gce-tradefed
similarity index 91%
rename from tools/vts-tradefed/etc/vts-gce-tradefed
rename to tools/vts-tradefed/etc/vts10-gce-tradefed
index 318d7d2..197ab38 100755
--- a/tools/vts-tradefed/etc/vts-gce-tradefed
+++ b/tools/vts-tradefed/etc/vts10-gce-tradefed
@@ -17,4 +17,4 @@
# launcher script for vts-tradefed harness
# can be used from an Android build environment, or a standalone vts zip
-TF_GLOBAL_CONFIG=google/continuous/gce-global-config vts-tradefed
+TF_GLOBAL_CONFIG=google/continuous/gce-global-config vts10-tradefed
diff --git a/tools/vts-tradefed/etc/vts-tradefed b/tools/vts-tradefed/etc/vts10-tradefed
similarity index 76%
rename from tools/vts-tradefed/etc/vts-tradefed
rename to tools/vts-tradefed/etc/vts10-tradefed
index 484e8aa..c5ec8bf 100755
--- a/tools/vts-tradefed/etc/vts-tradefed
+++ b/tools/vts-tradefed/etc/vts10-tradefed
@@ -14,15 +14,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# launcher script for vts-tradefed harness
+# launcher script for vts10-tradefed harness
# can be used from an Android build environment, or a standalone vts zip
#
# Usage:
# # to test a device with system.img = v9.0 and vendor.img = v9.0
-# $ vts-tradefed
+# $ vts10-tradefed
#
# # to test a device with system.img = v9.0 and vendor.img = v8.1
-# $ vts-tradefed -v=8.1
+# $ vts10-tradefed -v=8.1
#
# # all other cases are unsupported
#
@@ -71,30 +71,30 @@
fi
if [ "$VTF_BUILD_TARGET_NAME" != "vtf" ]; then
- VTF_BUILD_TARGET_NAME="vts"
+ VTF_BUILD_TARGET_NAME="vts10"
fi
# check if in Android build env
if [ ! -z "${ANDROID_BUILD_TOP}" ]; then
if [ ! -z "${ANDROID_HOST_OUT}" ]; then
- VTS_ROOT=${ANDROID_HOST_OUT}/${VTF_BUILD_TARGET_NAME}
+ VTS10_ROOT=${ANDROID_HOST_OUT}/${VTF_BUILD_TARGET_NAME}
else
- VTS_ROOT=${ANDROID_BUILD_TOP}/${OUT_DIR:-out}/host/${OS}/${VTF_BUILD_TARGET_NAME}
+ VTS10_ROOT=${ANDROID_BUILD_TOP}/${OUT_DIR:-out}/host/${OS}/${VTF_BUILD_TARGET_NAME}
fi
- if [ ! -d ${VTS_ROOT} ]; then
- echo "Could not find $VTS_ROOT in Android build environment. Try 'make ${VTF_BUILD_TARGET_NAME}'"
+ if [ ! -d ${VTS10_ROOT} ]; then
+ echo "Could not find $VTS10_ROOT in Android build environment. Try 'make ${VTF_BUILD_TARGET_NAME}'"
exit
fi;
fi;
-if [ -z ${VTS_ROOT} ]; then
+if [ -z ${VTS10_ROOT} ]; then
# assume we're in an extracted vts install
- VTS_ROOT="$(dirname $(readlink -e $0))/../.."
+ VTS10_ROOT="$(dirname $(readlink -e $0))/../.."
fi;
-VTS_JAR_DIR=${VTS_ROOT}/android-${VTF_BUILD_TARGET_NAME}/tools
+VTS10_JAR_DIR=${VTS10_ROOT}/android-${VTF_BUILD_TARGET_NAME}/tools
STANDALONE_JAR_DIR=${ANDROID_HOST_OUT}/framework
-JAR_DIRS="$VTS_JAR_DIR
+JAR_DIRS="$VTS10_JAR_DIR
$STANDALONE_JAR_DIR"
JAR_DIR=""
@@ -109,15 +109,15 @@
# If we didn't find the TF jar, resort to tf prebuilt in VTS_JAR_DIR.
if [ -z $JAR_DIR ]; then
- JAR_DIR=$VTS_JAR_DIR
+ JAR_DIR=$VTS10_JAR_DIR
TRADEFED_JAR="tradefed-prebuilt"
fi
JARS="${TRADEFED_JAR}
loganalysis
hosttestlib
- vts-tradefed
- vts-tradefed-tests
+ vts10-tradefed
+ vts10-tradefed-tests
compatibility-host-util
vts-core-tradefed-harness"
@@ -135,7 +135,7 @@
google-tradefed"
for JAR in $OPTIONAL_JARS; do
- for OPT_JAR_DIR in $VTS_ROOT $JAR_DIR; do
+ for OPT_JAR_DIR in $VTS10_ROOT $JAR_DIR; do
if [ -f "${OPT_JAR_DIR}/${JAR}.jar" ]; then
echo "Including optional JAR: ${OPT_JAR_DIR}/${JAR}.jar"
JAR_PATH=${JAR_PATH}:${OPT_JAR_DIR}/${JAR}.jar
@@ -145,7 +145,7 @@
done
# load any shared libraries for host-side executables
-LIB_DIR=${VTS_ROOT}/android-${VTF_BUILD_TARGET_NAME}/lib
+LIB_DIR=${VTS10_ROOT}/android-${VTF_BUILD_TARGET_NAME}/lib
if [ "$HOST" == "Linux" ]; then
LD_LIBRARY_PATH=${LIB_DIR}:${LIB_DIR}64:${LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
@@ -155,7 +155,7 @@
fi
# include any host-side test jars
-for j in ${VTS_ROOT}/android-${VTF_BUILD_TARGET_NAME}/testcases/*.jar; do
+for j in ${VTS10_ROOT}/android-${VTF_BUILD_TARGET_NAME}/testcases/*.jar; do
JAR_PATH=${JAR_PATH}:$j
done
@@ -180,9 +180,9 @@
done
if [ -z "${VENDOR}" ]; then
- VTS_TESTCASES=${VTS_ROOT}/android-${VTF_BUILD_TARGET_NAME}/testcases/
+ VTS10_TESTCASES=${VTS10_ROOT}/android-${VTF_BUILD_TARGET_NAME}/testcases/
else
- VTS_TESTCASES=${VTS_ROOT}/android-${VTF_BUILD_TARGET_NAME}/${VENDOR}/testcases/
+ VTS10_TESTCASES=${VTS10_ROOT}/android-${VTF_BUILD_TARGET_NAME}/${VENDOR}/testcases/
fi
-cd ${VTS_TESTCASES}; VTS_TESTCASES=${VTS_TESTCASES} java -Xmx4096m $RDBG_FLAG -cp ${JAR_PATH} -DVTS_ROOT=${VTS_ROOT} com.android.compatibility.common.tradefed.command.CompatibilityConsole "${ARGS[@]}"
+cd ${VTS10_TESTCASES}; VTS10_TESTCASES=${VTS10_TESTCASES} java -Xmx4096m $RDBG_FLAG -cp ${JAR_PATH} -DVTS10_ROOT=${VTS10_ROOT} com.android.compatibility.common.tradefed.command.CompatibilityConsole "${ARGS[@]}"
diff --git a/tools/vts-tradefed/etc/vts-tradefed_win.bat b/tools/vts-tradefed/etc/vts10-tradefed_win.bat
similarity index 97%
rename from tools/vts-tradefed/etc/vts-tradefed_win.bat
rename to tools/vts-tradefed/etc/vts10-tradefed_win.bat
index 0d65e0a..9e77b52 100644
--- a/tools/vts-tradefed/etc/vts-tradefed_win.bat
+++ b/tools/vts-tradefed/etc/vts10-tradefed_win.bat
@@ -12,7 +12,7 @@
:: See the License for the specific language governing permissions and
:: limitations under the License.
-:: Launcher script for vts-tradefed harness
+:: Launcher script for vts10-tradefed harness
:: Can be used from an Android build environment, or a standalone VTS zip
:: Caution: Although this script can be used to run VTS on Windows,
:: Windows host is not yet officially supported.
@@ -70,8 +70,8 @@
set JARS=^
loganalysis^
hosttestlib^
- vts-tradefed^
- vts-tradefed-tests^
+ vts10-tradefed^
+ vts10-tradefed-tests^
compatibility-host-util
for %%J in (%JARS%) do (
set JAR=%JAR_DIR%\%%J.jar
diff --git a/tools/vts-tradefed/res/config/cts-base-common.xml b/tools/vts-tradefed/res/config/cts-base-common.xml
index 71f5118..89df8d2 100644
--- a/tools/vts-tradefed/res/config/cts-base-common.xml
+++ b/tools/vts-tradefed/res/config/cts-base-common.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Base test plan for running CTS test modules with VTS">
+<configuration description="Base test plan for running CTS test modules with VTS10">
<option name="dynamic-sharding" value="true" />
<device_recovery class="com.android.tradefed.device.WaitDeviceRecovery" />
@@ -34,7 +34,7 @@
<result_reporter class="com.android.tradefed.result.suite.SuiteResultReporter" />
<include name="cts-preconditions" />
- <option name="dynamic-config-pusher:dynamic-resource-name" value="vts-tradefed" />
+ <option name="dynamic-config-pusher:dynamic-resource-name" value="vts10-tradefed" />
<include name="cts-system-checkers" />
<include name="cts-known-failures" />
diff --git a/tools/vts-tradefed/res/config/cts-base-filters.xml b/tools/vts-tradefed/res/config/cts-base-filters.xml
index cb04785..2aff2bc 100644
--- a/tools/vts-tradefed/res/config/cts-base-filters.xml
+++ b/tools/vts-tradefed/res/config/cts-base-filters.xml
@@ -14,9 +14,9 @@
limitations under the License.
-->
<configuration description="Base test filters for CTS based tests">
- <!-- Specialization to be able to run CTS inside android-vts.zip -->
+ <!-- Specialization to be able to run CTS inside android-vts10.zip -->
<option name="compatibility-build-provider:url-suite-name-override" value="CTS" />
- <option name="dynamic-config-pusher:dynamic-resource-name" value="vts-tradefed" />
+ <option name="dynamic-config-pusher:dynamic-resource-name" value="vts10-tradefed" />
<option name="compatibility:primary-abi-only" value="true" />
<option name="compatibility:config-patterns" value="Cts.*\.config" />
diff --git a/tools/vts-tradefed/res/config/cts-gsi-sanity.xml b/tools/vts-tradefed/res/config/cts-gsi-sanity.xml
index 8171097..9d2c4db 100644
--- a/tools/vts-tradefed/res/config/cts-gsi-sanity.xml
+++ b/tools/vts-tradefed/res/config/cts-gsi-sanity.xml
@@ -17,7 +17,7 @@
<include name="cts" />
<option name="compatibility-build-provider:url-suite-name-override" value="CTS" />
- <option name="dynamic-config-pusher:dynamic-resource-name" value="vts-tradefed" />
+ <option name="dynamic-config-pusher:dynamic-resource-name" value="vts10-tradefed" />
<option name="plan" value="cts-gsi-sanity" />
diff --git a/tools/vts-tradefed/res/config/cts-vendor-interface.xml b/tools/vts-tradefed/res/config/cts-vendor-interface.xml
index b478c66..042859a 100644
--- a/tools/vts-tradefed/res/config/cts-vendor-interface.xml
+++ b/tools/vts-tradefed/res/config/cts-vendor-interface.xml
@@ -17,7 +17,7 @@
<include name="cts" />
<option name="compatibility-build-provider:url-suite-name-override" value="CTS" />
- <option name="dynamic-config-pusher:dynamic-resource-name" value="vts-tradefed" />
+ <option name="dynamic-config-pusher:dynamic-resource-name" value="vts10-tradefed" />
<option name="plan" value="cts-vendor-interface" />
diff --git a/tools/vts-tradefed/res/config/vts.xml b/tools/vts-tradefed/res/config/vts10.xml
similarity index 100%
rename from tools/vts-tradefed/res/config/vts.xml
rename to tools/vts-tradefed/res/config/vts10.xml
