diff --git a/compiler-rt/test/asan/TestCases/Posix/no-fd.cpp b/compiler-rt/test/asan/TestCases/Posix/no-fd.cpp --- a/compiler-rt/test/asan/TestCases/Posix/no-fd.cpp +++ b/compiler-rt/test/asan/TestCases/Posix/no-fd.cpp @@ -4,6 +4,11 @@ // Test ASan initialization +// This test closes the 0, 1, and 2 file descriptors before an exec() and relies +// on them remaining closed across an execve(). This is not the case on newer +// versions of Android. +// UNSUPPORTED: android + #include #include #include diff --git a/compiler-rt/test/asan/TestCases/strstr_strict.c b/compiler-rt/test/asan/TestCases/strstr_strict.c --- a/compiler-rt/test/asan/TestCases/strstr_strict.c +++ b/compiler-rt/test/asan/TestCases/strstr_strict.c @@ -1,6 +1,12 @@ // Test strict_string_checks option in strstr function // RUN: %clang_asan %s -o %t && %run %t 2>&1 + +// Newer versions of Android's strstr() uses memchr() internally, which actually +// does trigger a heap-buffer-overflow (as it tries to find the +// null-terminator). +// UNSUPPORTED: android // RUN: %env_asan_opts=strict_string_checks=false %run %t 2>&1 + // RUN: %env_asan_opts=strict_string_checks=true not %run %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cpp b/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cpp --- a/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cpp +++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/feof_fileno_ferror.cpp @@ -1,5 +1,9 @@ // RUN: %clangxx -g %s -o %t && %run %t +// Newer versions of Android have FDSan, and will fail this test as FDSan will +// catch the error instead. +// UNSUPPORTED: android + #include #include #include