Merge "Reland "Add VtsKernelLibIonTest"" am: 007caaa0f2
Change-Id: I64ac6f532622019539ddd7c3e086e3b683b256df
diff --git a/tests/Android.bp b/tests/Android.bp
index 989e029..25b703d 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -31,4 +31,12 @@
"map_test.cpp",
"modular_heap_check.cpp",
],
+ test_suites: ["vts-core"],
+ auto_gen_config: true,
+ test_min_api_level: 30,
}
+
+vts_config {
+ name: "VtsKernelLibIonTest",
+}
+
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
new file mode 100644
index 0000000..e79f7f0
--- /dev/null
+++ b/tests/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?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 VtsKernelLibIonTest">
+ <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="VtsKernelLibIonTest"/>
+ <option name="binary-test-source" value="_32bit::DATA/nativetest/ion-unit-tests/ion-unit-tests" />
+ <option name="binary-test-source" value="_64bit::DATA/nativetest64/ion-unit-tests/ion-unit-tests" />
+ <option name="binary-test-type" value="gtest"/>
+ <option name="test-timeout" value="1m"/>
+ <option name="precondition-first-api-level" value="30" />
+ </test>
+</configuration>
+
