commit be3d71abfde46935282377b36567de4075e6970a
author Christopher Ferris <cferris@google.com> Thu Aug 01 17:49:12 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 01 17:49:12 2024 +0000
tree baa4b7c6a5be24b320377333bf4b69cf87b7cf1a
parent eadd64fbd2bdb350cd15710b2500b83d81019a81
parent fb4b87ba59745b6400f365f7e2100c9665d477e7

Merge "Disable hwasan tests on zero checking tests." into main

tests/malloc_test.cpp

diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp
index a5916d3..813f348 100644
--- a/tests/malloc_test.cpp
+++ b/tests/malloc_test.cpp
@@ -1627,6 +1627,7 @@
 #if !defined(__BIONIC__)
   GTEST_SKIP() << "Only valid on bionic";
 #endif
+  SKIP_WITH_HWASAN << "Only test system allocator, not hwasan allocator.";
 
   if (IsLowRamDevice()) {
     GTEST_SKIP() << "Skipped on low memory devices.";
@@ -1657,6 +1658,7 @@
 #if !defined(__BIONIC__)
   GTEST_SKIP() << "Only valid on bionic";
 #endif
+  SKIP_WITH_HWASAN << "Only test system allocator, not hwasan allocator.";
 
   if (IsLowRamDevice()) {
     GTEST_SKIP() << "Skipped on low memory devices.";
@@ -1687,6 +1689,7 @@
 #if !defined(__BIONIC__)
   GTEST_SKIP() << "Only valid on bionic";
 #endif
+  SKIP_WITH_HWASAN << "Only test system allocator, not hwasan allocator.";
 
   if (IsLowRamDevice()) {
     GTEST_SKIP() << "Skipped on low memory devices.";