diff options
| -rw-r--r-- | artd/art_standalone_artd_tests.xml | 1 | ||||
| -rw-r--r-- | dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml | 1 | ||||
| -rw-r--r-- | libartservice/service/Android.bp | 1 | ||||
| -rw-r--r-- | libarttools/Android.bp | 1 | ||||
| -rw-r--r-- | odrefresh/Android.bp | 1 | ||||
| -rw-r--r-- | test/Android.bp | 7 | ||||
| -rw-r--r-- | test/art-gtests-target-standalone-non-multilib-template.xml | 44 |
7 files changed, 56 insertions, 0 deletions
diff --git a/artd/art_standalone_artd_tests.xml b/artd/art_standalone_artd_tests.xml index 951e7acb05..00e0de9fd3 100644 --- a/artd/art_standalone_artd_tests.xml +++ b/artd/art_standalone_artd_tests.xml @@ -15,6 +15,7 @@ --> <!-- Note: This test config file for {MODULE} is generated from a template. --> <configuration description="Runs {MODULE}."> + <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.art.apex" /> <option name="config-descriptor:metadata" key="mainline-param" value="com.android.art.apex" /> diff --git a/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml b/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml index a89221f4ae..ad37eb0104 100644 --- a/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml +++ b/dexopt_chroot_setup/art_standalone_dexopt_chroot_setup_tests.xml @@ -15,6 +15,7 @@ --> <!-- Note: This test config file for {MODULE} is generated from a template. --> <configuration description="Runs {MODULE}."> + <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.art.apex" /> <option name="config-descriptor:metadata" key="mainline-param" value="com.android.art.apex" /> diff --git a/libartservice/service/Android.bp b/libartservice/service/Android.bp index 0d7f91d65f..afc69e4264 100644 --- a/libartservice/service/Android.bp +++ b/libartservice/service/Android.bp @@ -234,6 +234,7 @@ art_cc_test { "libarttools", "libbase", ], + test_config_template: ":art-gtests-target-standalone-non-multilib-template", } android_test { diff --git a/libarttools/Android.bp b/libarttools/Android.bp index 5cee96cb11..b946f06c2b 100644 --- a/libarttools/Android.bp +++ b/libarttools/Android.bp @@ -130,6 +130,7 @@ art_cc_test { "libbase", "libfstab", ], + test_config_template: ":art-gtests-target-standalone-non-multilib-template", } cc_binary { diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp index 5dce09f047..e06b5a8685 100644 --- a/odrefresh/Android.bp +++ b/odrefresh/Android.bp @@ -262,6 +262,7 @@ art_cc_test { "libarttools", "libbase", ], + test_config_template: ":art-gtests-target-standalone-non-multilib-template", } genrule { diff --git a/test/Android.bp b/test/Android.bp index 9d4660abef..38c0ca0037 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -147,6 +147,13 @@ filegroup { srcs: ["art-gtests-target-standalone-cts-template.xml"], } +// Test configuration template for standalone ART gtests on target (not bundled with the ART APEX) +// which don't support multilib. +filegroup { + name: "art-gtests-target-standalone-non-multilib-template", + srcs: ["art-gtests-target-standalone-non-multilib-template.xml"], +} + // Test configuration template for standalone ART gtests run with a boot image on target (not // bundled with the ART APEX). filegroup { diff --git a/test/art-gtests-target-standalone-non-multilib-template.xml b/test/art-gtests-target-standalone-non-multilib-template.xml new file mode 100644 index 0000000000..e662c5f6f2 --- /dev/null +++ b/test/art-gtests-target-standalone-non-multilib-template.xml @@ -0,0 +1,44 @@ +<?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. +--> +<!-- Note: This test config file for {MODULE} is generated from a template. --> +<configuration description="Runs {MODULE} in non-multilib mode."> + <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> + <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.art.apex" /> + <option name="config-descriptor:metadata" key="mainline-param" value="com.android.art.apex" /> + + <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher"> + <option name="cleanup" value="true" /> + <option name="push" value="{MODULE}->/data/local/tmp/{MODULE}/{MODULE}" /> + <option name="append-bitness" value="true" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp/{MODULE}" /> + <option name="module-name" value="{MODULE}" /> + </test> + + <!-- When this test is run in a Mainline context (e.g. with `mts-tradefed`), only enable it if + one of the Mainline modules below is present on the device used for testing. --> + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> + <!-- ART Mainline Module (internal version). --> + <option name="mainline-module-package-name" value="com.google.android.art" /> + <!-- ART Mainline Module (external (AOSP) version). --> + <option name="mainline-module-package-name" value="com.android.art" /> + </object> + + <!-- Only run tests if the device under test is SDK version 31 (Android 12) or above. --> + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk31ModuleController" /> +</configuration> |