diff options
| author | Roland Levillain <rpl@google.com> | 2021-08-06 19:20:57 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-08-13 08:38:36 +0000 |
| commit | 0d1c54de4f79cea6f82c07b0856c06b9b593fcd5 (patch) | |
| tree | ebdb161a815eb3a6dfd058483e012b02ec14fdda /runtime | |
| parent | 7b4fead5e9441eeb9ff5a9336d500b49ffae8d97 (diff) | |
Add `Sdk31ModuleController` support to ART run-tests and gtests.
This in order to run these tests only if the device under test is
SDK version 31 (Android 12) or above.
Test: m mts && mts-tradefed run commandAndExit mts-art
Bug: 195178963
Bug: 184696655
Bug: 181724969
Ignore-AOSP-First: API level 31 not in AOSP yet
Change-Id: I4bb6405281809863562e5bbbfc1189f227f2508d
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/art_standalone_runtime_compiler_tests.xml | 3 | ||||
| -rw-r--r-- | runtime/art_standalone_runtime_tests.xml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/runtime/art_standalone_runtime_compiler_tests.xml b/runtime/art_standalone_runtime_compiler_tests.xml index 0f6bb4bf23..3b21e578d0 100644 --- a/runtime/art_standalone_runtime_compiler_tests.xml +++ b/runtime/art_standalone_runtime_compiler_tests.xml @@ -42,4 +42,7 @@ <!-- 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> diff --git a/runtime/art_standalone_runtime_tests.xml b/runtime/art_standalone_runtime_tests.xml index 1267213f20..1bb80fdafe 100644 --- a/runtime/art_standalone_runtime_tests.xml +++ b/runtime/art_standalone_runtime_tests.xml @@ -108,4 +108,7 @@ <!-- 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> |