summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 03:10:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-13 03:10:15 +0000
commit8745d2e15dee31d1ccaf5257305286a651c31e0c (patch)
tree1bba06616e5cc14c8afe47e4e6700462b8075f94
parent632440a17283f144d92586f6a35d9b6bb26ebf79 (diff)
parente6de5c26c4f26c9b2f7f2a69e2cc116374dac99d (diff)
downloadvndk-8745d2e15dee31d1ccaf5257305286a651c31e0c.tar.gz
Add vts_vndk_dependency_test to vts-core am: e2e918fc67 am: e6de5c26c4
Change-Id: I3447942466e208854d6b33381ae1f0a3febe3bb2
-rw-r--r--Android.bp6
-rw-r--r--dependency/vts_vndk_dependency_test.xml23
2 files changed, 28 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 90cc368..9eae205 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,7 +56,11 @@ python_test_host {
main: "dependency/vts_vndk_dependency_test.py",
srcs: [
"dependency/vts_vndk_dependency_test.py",
- ]
+ ],
+ test_suites: [
+ "vts-core",
+ ],
+ test_config: "dependency/vts_vndk_dependency_test.xml",
}
python_test_host {
diff --git a/dependency/vts_vndk_dependency_test.xml b/dependency/vts_vndk_dependency_test.xml
new file mode 100644
index 0000000..f0f37c7
--- /dev/null
+++ b/dependency/vts_vndk_dependency_test.xml
@@ -0,0 +1,23 @@
+<?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_vndk_dependency_test">
+ <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
+ <test class="com.android.tradefed.testtype.python.PythonBinaryHostTest">
+ <option name="par-file-name" value="vts_vndk_dependency_test" />
+ <option name="test-timeout" value="6m" />
+ </test>
+</configuration>
+