Merge "Rename vts-core to vts"

This commit is contained in:
Treehugger Robot 2020-04-07 05:11:55 +00:00 committed by Gerrit Code Review
commit edf8335c72
7 changed files with 6 additions and 7 deletions

View File

@ -49,6 +49,6 @@ cc_test_host {
auto_gen_config: false, auto_gen_config: false,
test_suites: [ test_suites: [
"general-tests", "general-tests",
"vts-core", "vts",
], ],
} }

View File

@ -79,7 +79,7 @@ cc_test {
cc_test { cc_test {
name: "vts_libdm_test", name: "vts_libdm_test",
defaults: ["libdm_test_defaults"], defaults: ["libdm_test_defaults"],
test_suites: ["vts-core"], test_suites: ["vts"],
test_min_api_level: 29, test_min_api_level: 29,
} }

View File

@ -81,7 +81,7 @@ cc_test {
"fiemap_writer_test.cpp", "fiemap_writer_test.cpp",
], ],
test_suites: ["vts-core", "device-tests"], test_suites: ["vts", "device-tests"],
auto_gen_config: true, auto_gen_config: true,
test_min_api_level: 29, test_min_api_level: 29,
require_root: true, require_root: true,

View File

@ -97,7 +97,7 @@ cc_test {
cc_test { cc_test {
name: "vts_core_liblp_test", name: "vts_core_liblp_test",
defaults: ["liblp_test_defaults"], defaults: ["liblp_test_defaults"],
test_suites: ["vts-core"], test_suites: ["vts"],
auto_gen_config: true, auto_gen_config: true,
test_min_api_level: 29, test_min_api_level: 29,
require_root: true, require_root: true,

View File

@ -19,7 +19,6 @@
<option name="cleanup" value="true" /> <option name="cleanup" value="true" />
<option name="push" value="liblp_test->/data/local/tmp/liblp_test" /> <option name="push" value="liblp_test->/data/local/tmp/liblp_test" />
</target_preparer> </target_preparer>
<option name="test-suite-tag" value="vts-core" />
<test class="com.android.tradefed.testtype.GTest" > <test class="com.android.tradefed.testtype.GTest" >
<option name="native-test-device-path" value="/data/local/tmp" /> <option name="native-test-device-path" value="/data/local/tmp" />
<option name="module-name" value="liblp_test" /> <option name="module-name" value="liblp_test" />

View File

@ -182,7 +182,7 @@ cc_defaults {
"libstorage_literals_headers", "libstorage_literals_headers",
], ],
test_suites: [ test_suites: [
"vts-core", "vts",
"device-tests" "device-tests"
], ],
test_min_api_level: 29, test_min_api_level: 29,

View File

@ -346,7 +346,7 @@ cc_test {
cc_test { cc_test {
name: "KernelLibcutilsTest", name: "KernelLibcutilsTest",
test_suites: ["general-tests", "vts-core"], test_suites: ["general-tests", "vts"],
defaults: ["libcutils_test_static_defaults"], defaults: ["libcutils_test_static_defaults"],
test_config: "KernelLibcutilsTest.xml", test_config: "KernelLibcutilsTest.xml",
} }