diff options
| author | Lev Rumyantsev <levarum@google.com> | 2023-07-06 01:41:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-06 01:41:54 +0000 |
| commit | ab681281aca05f6d2fa103f4597eeb7428267773 (patch) | |
| tree | b9db131a703694ba7128f98346c47825098e0cfb | |
| parent | a97abef3594157476fdf2c672c87743ef35edeab (diff) | |
| parent | debd82f9b185282ab3e0e6bd836b3f35fcb2096e (diff) | |
| download | art-ab681281aca05f6d2fa103f4597eeb7428267773.tar.gz | |
art: disable standalone cts tests for native-bridge am: debd82f9b1android-vts-14.0_r2android-cts-14.0_r2
Original change: https://android-review.googlesource.com/c/platform/art/+/2647524
Change-Id: Ib588afe35990b607a99c4164e60f98a5d29b7b6b
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> |