diff options
| -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> |