diff options
| author | 2023-07-06 03:11:21 +0000 | |
|---|---|---|
| committer | 2023-07-06 03:11:21 +0000 | |
| commit | 258f5f6cdbf278440e6be7fe7cd2c6f1fe3232db (patch) | |
| tree | 8e587a92ae4eae3affe8635bb647675acca14c99 | |
| parent | 3da62eda656628e1ffd5054d5bbc644a15ca6474 (diff) | |
| parent | 8134e0d6ee82551e80d78e63d585f5cc658038e4 (diff) | |
art: disable standalone cts tests for native-bridge am: debd82f9b1 am: ab681281ac am: 8134e0d6ee
Original change: https://android-review.googlesource.com/c/platform/art/+/2647524
Change-Id: I4a4e1144d87db0e38cd4f480947301992df572f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | dex2oat/art_standalone_dex2oat_cts_tests.xml | 5 | ||||
| -rw-r--r-- | test/art-gtests-target-standalone-cts-template.xml | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/dex2oat/art_standalone_dex2oat_cts_tests.xml b/dex2oat/art_standalone_dex2oat_cts_tests.xml index cf20994ab9..a47febe545 100644 --- a/dex2oat/art_standalone_dex2oat_cts_tests.xml +++ b/dex2oat/art_standalone_dex2oat_cts_tests.xml @@ -67,4 +67,9 @@ <!-- 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" /> + + <!-- Controller that will skip the module if a native bridge situation is detected. + For example: module wants to run arm and device is x86. This module tests art + internals which are never executed in native bridge situation. --> + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.NativeBridgeModuleController" /> </configuration> diff --git a/test/art-gtests-target-standalone-cts-template.xml b/test/art-gtests-target-standalone-cts-template.xml index 36e2de037a..3749c3e990 100644 --- a/test/art-gtests-target-standalone-cts-template.xml +++ b/test/art-gtests-target-standalone-cts-template.xml @@ -45,4 +45,8 @@ <!-- 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" /> + <!-- Controller that will skip the module if a native bridge situation is detected. + For example: module wants to run arm and device is x86. This module tests art + internals which are never executed in native bridge situation. --> + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.NativeBridgeModuleController" /> </configuration> |