diff options
| -rw-r--r-- | compiler-rt/test/hwasan/TestCases/Posix/system-allocator-fallback.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/test/lit.common.cfg | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/compiler-rt/test/hwasan/TestCases/Posix/system-allocator-fallback.cc b/compiler-rt/test/hwasan/TestCases/Posix/system-allocator-fallback.cc index 0e44aae7d6a..8678d906dae 100644 --- a/compiler-rt/test/hwasan/TestCases/Posix/system-allocator-fallback.cc +++ b/compiler-rt/test/hwasan/TestCases/Posix/system-allocator-fallback.cc @@ -2,6 +2,10 @@ // RUN: %clangxx_hwasan -shared %s -o %t.so -DSHARED_LIB -shared-libsan -Wl,-rpath,%compiler_rt_libdir // RUN: %env_hwasan_opts=disable_allocator_tagging=0 %run %t +// The dynamic loader on Android O appears to have a bug where it crashes when +// dlopening DF_1_GLOBAL libraries. +// REQUIRES: android-28 + #include <stddef.h> // Test that allocations made by the system allocator can be realloc'd and freed diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg index cdcba5fc9d5..975ae29e812 100644 --- a/compiler-rt/test/lit.common.cfg +++ b/compiler-rt/test/lit.common.cfg @@ -286,6 +286,8 @@ if config.android: lit_config.fatal("Failed to read ro.build.version.sdk (using '%s' as adb): got '%s'" % (adb, android_api_level_str)) if android_api_level >= 26: config.available_features.add('android-26') + if android_api_level >= 28: + config.available_features.add('android-28') sancovcc_path = os.path.join(config.llvm_tools_dir, "sancov") if os.path.exists(sancovcc_path): |
