diff --git a/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp b/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp --- a/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp +++ b/compiler-rt/lib/scudo/standalone/tests/wrappers_cpp_test.cpp @@ -17,6 +17,13 @@ #include #include +// Android does not support checking for new/delete mismatches. +#if SCUDO_ANDROID +#define SKIP_MISMATCH_TESTS 1 +#else +#define SKIP_MISMATCH_TESTS 0 +#endif + void operator delete(void *, size_t) noexcept; void operator delete[](void *, size_t) noexcept; @@ -69,7 +76,7 @@ }; TEST(ScudoWrappersCppDeathTest, New) { - if (getenv("SKIP_TYPE_MISMATCH")) { + if (getenv("SKIP_TYPE_MISMATCH") || SKIP_MISMATCH_TESTS) { printf("Skipped type mismatch tests.\n"); return; }