ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove vts10 related configs"

Browse source
This commit is contained in:
Treehugger Robot 2020-10-07 00:35:38 +00:00 • committed by Gerrit Code Review
commit 52578dda5b
12 changed files with 0 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libdm/Android.bp
View file

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

31
fs_mgr/libdm/AndroidTest.xml
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>

4
fs_mgr/liblp/Android.bp
View file

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

31
fs_mgr/liblp/AndroidTest.xml
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>

6
fs_mgr/libsnapshot/Android.bp
View file

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

29
fs_mgr/libsnapshot/VtsLibsnapshotTest.xml
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>

1
fs_mgr/tests/Android.bp
View file

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

1
init/Android.bp
View file

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

1
liblog/tests/Android.bp
View file

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

5
libprocessgroup/profiles/Android.bp
View file

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

29
libprocessgroup/profiles/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>

1
logd/Android.bp
View file

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