Merge "Skip zeroed malloc tests on hwasan."
diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp
index 5f5e3dd..38661c7 100644
--- a/tests/gwp_asan_test.cpp
+++ b/tests/gwp_asan_test.cpp
@@ -34,6 +34,7 @@
#if defined(__BIONIC__)
#include "android-base/file.h"
+#include "android-base/test_utils.h"
#include "gwp_asan/options.h"
#include "platform/bionic/malloc.h"
#include "sys/system_properties.h"
@@ -57,7 +58,13 @@
// the torture mode is is generally 40,000, so that svelte devices don't
// explode, as this uses ~163MiB RAM (4KiB per live allocation).
TEST(gwp_asan_integration, malloc_tests_under_torture) {
- RunGwpAsanTest("malloc.*:-malloc.mallinfo*");
+ if (running_with_hwasan()) {
+ // Skip the malloc.zeroed tests since they fail in this particular config.
+ // TODO(b/267386540): Need to fix this problem.
+ RunGwpAsanTest("malloc.*:-malloc.mallinfo*:malloc.zeroed*");
+ } else {
+ RunGwpAsanTest("malloc.*:-malloc.mallinfo*");
+ }
}
class SyspropRestorer {