aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Mayer <fmayer@google.com>2022-04-15 13:16:21 -0700
committerFlorian Mayer <fmayer@google.com>2022-04-20 22:02:54 +0000
commit208efc5cbea150bee7df302e88734f239dc8b459 (patch)
tree57b8a5b3d08fd7cd69b2bde5469aa68eadbeef49
parenta7eccd02adfa73fb6a8a13d55b69a65c21bb49db (diff)
downloadlibmemunreachable-208efc5cbea150bee7df302e88734f239dc8b459.tar.gz
Disable libmemunreachable tests on HWASan builds.
Bug: 229317612 Test: atest on flame_hwasan Change-Id: I4768a520c0045804521b2696b9691ca9b69050a2
-rw-r--r--Android.bp8
-rw-r--r--tests/DisableMalloc_test.cpp7
-rw-r--r--tests/MemUnreachable_test.cpp4
3 files changed, 17 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 77f126a..2a3fa1f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,7 +61,9 @@ cc_test {
"tests/MemUnreachable_test.cpp",
],
shared_libs: ["libmemunreachable"],
-
+ header_libs: [
+ "libbase_headers",
+ ],
test_suites: ["device-tests"],
}
@@ -99,7 +101,9 @@ cc_test {
enabled: false,
},
},
-
+ header_libs: [
+ "libbase_headers",
+ ],
test_suites: ["device-tests"],
}
diff --git a/tests/DisableMalloc_test.cpp b/tests/DisableMalloc_test.cpp
index f446719..ae560ed 100644
--- a/tests/DisableMalloc_test.cpp
+++ b/tests/DisableMalloc_test.cpp
@@ -19,6 +19,8 @@
#include <chrono>
#include <functional>
+#include <android-base/test_utils.h>
+
#include <ScopedDisableMalloc.h>
#include <gtest/gtest.h>
@@ -35,6 +37,11 @@ class DisableMallocTest : public ::testing::Test {
t.it_value.tv_usec = (us - s).count();
setitimer(ITIMER_REAL, &t, NULL);
}
+
+ void SetUp() override {
+ // HWASan does not support malloc_disable.
+ SKIP_WITH_HWASAN;
+ }
};
TEST_F(DisableMallocTest, reenable) {
diff --git a/tests/MemUnreachable_test.cpp b/tests/MemUnreachable_test.cpp
index 9cb1623..ce8c23d 100644
--- a/tests/MemUnreachable_test.cpp
+++ b/tests/MemUnreachable_test.cpp
@@ -19,6 +19,8 @@
#include <sys/prctl.h>
#include <unistd.h>
+#include <android-base/test_utils.h>
+
#include <gtest/gtest.h>
#include <memunreachable/memunreachable.h>
@@ -54,6 +56,8 @@ static void Ref(void** ptr) {
class MemunreachableTest : public ::testing::Test {
protected:
virtual void SetUp() {
+ // HWASan does not support malloc_disable, which is required by memunreachable.
+ SKIP_WITH_HWASAN;
CleanStack(8192);
CleanTcache();
}