diff options
| author | Lev Rumyantsev <levarum@google.com> | 2023-06-07 19:00:30 -0700 |
|---|---|---|
| committer | Lev Rumyantsev <levarum@google.com> | 2023-07-01 17:23:49 +0000 |
| commit | debd82f9b185282ab3e0e6bd836b3f35fcb2096e (patch) | |
| tree | 0d4f529530e59722d856a8984a979ff7646b050a | |
| parent | cc2621aad755d2532dae350ef9627d9b195b11af (diff) | |
| download | art-debd82f9b185282ab3e0e6bd836b3f35fcb2096e.tar.gz | |
art: disable standalone cts tests for native-bridge
Some of these tests are dynamically linking non-NDK libraries
which native-bridge doesn't support. But also art code is never
executed under native-bridge in production since we only use it
to execute app's libraries.
Test: tests are skipped for native-bridge and
not skipped without native bridge
art_standalone_dex2oat_cts_tests
art_standalone_libartpalette_tests
art_standalone_libdexfile_external_tests
Bug: 268440713
Change-Id: Ic11ee51768aa305ffb84bf1da3bade855e078f6a
(cherry picked from commit b31b0443b7a15bef69bd3048094fe0eff204124f)
| -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 980b295f39..0dabfdab6c 100644 --- a/dex2oat/art_standalone_dex2oat_cts_tests.xml +++ b/dex2oat/art_standalone_dex2oat_cts_tests.xml @@ -66,4 +66,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> |