summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Srbecky <dsrbecky@google.com> 2025-03-24 06:54:38 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-03-24 06:54:38 -0700
commit33e281d73cc1c09f1e8452df40cf53052ce814f8 (patch)
tree701d5b01bf11ddc15f1069fbf6c04d56a58ca256
parenta94b9a60d808441c269d8a6db3d379ba722d03f9 (diff)
parentefe4925792735c2fd9dd95b7c67173b119ff2968 (diff)
Run-test: Add 'ArtTest' atest target am: efe4925792
Original change: https://android-review.googlesource.com/c/platform/art/+/3554365 Change-Id: I36684fb4d7aa9971907b6b34336ac3963cf5004a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--test/Android.bp12
-rw-r--r--test/ArtTest.xml27
2 files changed, 39 insertions, 0 deletions
diff --git a/test/Android.bp b/test/Android.bp
index 76559a92c4..a447d4aa37 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -1392,6 +1392,18 @@ art_cc_test {
test_config: "art-gtests-target-chroot.xml",
}
+art_cc_test {
+ name: "ArtTest",
+ data: [
+ // We need the ART testing apex, which contains debug binaries and other utilities.
+ ":com.android.art.testing",
+ // Archive which contains all run-test data and test-specific bash scripts to run them.
+ ":art-test-target-fg",
+ ],
+ test_suites: ["general-tests"],
+ test_config: "ArtTest.xml",
+}
+
csuite_test {
name: "csuite-app-compile-launch",
test_config_template: "csuite-app-compile-launch.xml",
diff --git a/test/ArtTest.xml b/test/ArtTest.xml
new file mode 100644
index 0000000000..05d7e96d68
--- /dev/null
+++ b/test/ArtTest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2025 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="ART generic test runner">
+ <option name="test-suite-tag" value="ArtTest" />
+
+ <target_preparer class="com.android.tradefed.targetprep.InstallApexModuleTargetPreparer" >
+ <option name="test-file-name" value="com.android.art.testing.apex" />
+ </target_preparer>
+
+ <!--
+ <test class="com.android.tradefed.testtype.ArtTest">
+ </test>
+ -->
+</configuration>