Remove vts10 related configs

Bug: 169582597
Test: build
Change-Id: I38e1e0f8e32b86ab14b905d040c1c62245a1a9e3
This commit is contained in:
Dan Shi 2020-10-06 13:52:44 -07:00
parent 9602e3d31a
commit 67b7dd570f
12 changed files with 0 additions and 143 deletions

View File

@ -99,7 +99,3 @@ cc_fuzz {
"liblog",
],
}
vts_config {
name: "VtsKernelLibdmTest",
}

View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration description="Config for VTS VtsKernelLibdmTest">
<option name="config-descriptor:metadata" key="plan" value="vts-kernel" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HostDrivenTest.push"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsKernelLibdmTest"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/libdm_test/libdm_test" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/libdm_test/libdm_test" />
<option name="binary-test-type" value="gtest"/>
<option name="test-timeout" value="1m"/>
<option name="precondition-first-api-level" value="29" />
</test>
</configuration>

View File

@ -107,7 +107,3 @@ cc_test {
name: "vts_kernel_liblp_test",
defaults: ["liblp_test_defaults"],
}
vts_config {
name: "VtsKernelLiblpTest",
}

View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration description="Config for VTS VtsKernelLiblpTest">
<option name="config-descriptor:metadata" key="plan" value="vts-kernel" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HostDrivenTest.push"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsKernelLiblpTest"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/vts_kernel_liblp_test/vts_kernel_liblp_test" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_kernel_liblp_test/vts_kernel_liblp_test" />
<option name="binary-test-type" value="gtest"/>
<option name="test-timeout" value="1m"/>
<option name="precondition-first-api-level" value="29" />
</test>
</configuration>

View File

@ -267,12 +267,6 @@ cc_test {
defaults: ["libsnapshot_test_defaults"],
}
// For VTS 10
vts_config {
name: "VtsLibsnapshotTest",
test_config: "VtsLibsnapshotTest.xml"
}
cc_binary {
name: "snapshotctl",
srcs: [

View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration description="Config for VTS VtsLibsnapshotTest">
<option name="config-descriptor:metadata" key="plan" value="vts-kernel"/>
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HostDrivenTest.push"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsLibsnapshotTest"/>
<option name="binary-test-source" value="_32bit::DATA/nativetest/vts_libsnapshot_test/vts_libsnapshot_test"/>
<option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_libsnapshot_test/vts_libsnapshot_test"/>
<option name="binary-test-type" value="gtest"/>
<option name="test-timeout" value="5m"/>
</test>
</configuration>

View File

@ -17,7 +17,6 @@ cc_test {
test_suites: [
"cts",
"device-tests",
"vts10",
],
compile_multilib: "both",
multilib: {

View File

@ -273,7 +273,6 @@ cc_test {
test_suites: [
"cts",
"device-tests",
"vts10",
],
}

View File

@ -98,7 +98,6 @@ cc_test {
test_suites: [
"cts",
"device-tests",
"vts10",
],
}

View File

@ -104,8 +104,3 @@ cc_test {
"vts",
],
}
vts_config {
name: "VtsProcessgroupValidateTest",
test_config: "vts_processgroup_validate_test.xml",
}

View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<configuration description="Config for VtsProcessgroupValidateTest">
<option name="config-descriptor:metadata" key="plan" value="vts-treble" />
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
<option name="abort-on-push-failure" value="false"/>
<option name="push-group" value="HostDrivenTest.push"/>
</target_preparer>
<test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
<option name="test-module-name" value="VtsProcessgroupValidateTest"/>
<option name="binary-test-working-directory" value="_32bit::/data/nativetest/" />
<option name="binary-test-working-directory" value="_64bit::/data/nativetest64/" />
<option name="binary-test-source" value="_32bit::DATA/nativetest/vts_processgroup_validate_test/vts_processgroup_validate_test" />
<option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_processgroup_validate_test/vts_processgroup_validate_test" />
<option name="binary-test-type" value="gtest"/>
<option name="binary-test-disable-framework" value="false"/>
<option name="test-timeout" value="30s"/>
</test>
</configuration>

View File

@ -186,7 +186,6 @@ cc_test {
test_suites: [
"cts",
"device-tests",
"vts10",
],
}