diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-22 02:22:23 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-22 02:22:23 +0000 |
commit | 4d99da7cd821da99d730c5265d23e67d9bc45a18 (patch) | |
tree | 9f2bda01248926df96806bf45293cb34e18c071e | |
parent | c6fc351964cdfd3292b7f8c490fb064c1119ae57 (diff) | |
parent | 265b84dda9b01acd891dd9ae039feeb01e1281f1 (diff) | |
download | vts-4d99da7cd821da99d730c5265d23e67d9bc45a18.tar.gz |
Snap for 11481241 from 265b84dda9b01acd891dd9ae039feeb01e1281f1 to sdk-release
Change-Id: Ibc7791b85bcc54351d06a96559222cd9ddf1b4ec
-rw-r--r-- | OWNERS | 4 | ||||
-rw-r--r-- | tools/vts-core-tradefed/Android.bp | 2 | ||||
-rw-r--r-- | tools/vts-core-tradefed/res/config/collect-tests-only.xml | 35 |
3 files changed, 40 insertions, 1 deletions
@@ -2,3 +2,7 @@ dshi@google.com guangzhu@google.com jdesprez@google.com sbasi@google.com + +# Android xTS Infra Approvers +wenshan@google.com +kgui@google.com diff --git a/tools/vts-core-tradefed/Android.bp b/tools/vts-core-tradefed/Android.bp index 99af4e251..b8595dbec 100644 --- a/tools/vts-core-tradefed/Android.bp +++ b/tools/vts-core-tradefed/Android.bp @@ -37,8 +37,8 @@ tradefed_binary_host { full_name: "Vendor Test Suite", version: "14_r4", static_libs: [ - "cts-tradefed-harness", "vts-core-tradefed-harness", + "cts-tradefed-harness", ], required: ["compatibility-host-util"], } diff --git a/tools/vts-core-tradefed/res/config/collect-tests-only.xml b/tools/vts-core-tradefed/res/config/collect-tests-only.xml new file mode 100644 index 000000000..c22265ba1 --- /dev/null +++ b/tools/vts-core-tradefed/res/config/collect-tests-only.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2024 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="Runs VTS from a pre-existing VTS installation"> + + <include name="vts" /> + + <!-- This tells vts-tradefed and the server what the plan name is, reports that have this plan + name should not be accepted, as it doesn't actually run the tests it simply marks all of + them as passed. + Obviously no one would modify the report before uploading to falsify this + information, as that would be dishonest, and dishonesty kills kittens :'( --> + <option name="plan" value="collect-tests-only" /> + + <option name="skip-preconditions" value="true" /> + <option name="skip-system-status-check" value="com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker" /> + <option name="preparer-whitelist" value="com.android.tradefed.targetprep.suite.SuiteApkInstaller" /> + <option name="preparer-whitelist" value="com.android.compatibility.common.tradefed.targetprep.ApkInstaller" /> + <option name="preparer-whitelist" value="com.android.compatibility.common.tradefed.targetprep.FilePusher" /> + + <option name="compatibility:collect-tests-only" value="true" /> + +</configuration> |