summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
diff options
context:
space:
mode:
authorDeyao Ren <deyaoren@google.com>2022-03-07 19:26:54 +0000
committerDeyao Ren <deyaoren@google.com>2022-03-07 19:39:39 +0000
commit7d49bce5c1291757ac72cbc0d78530464a6818a0 (patch)
tree496070d391f4ac60801d59b6a174101144e60da8 /libc/malloc_hooks/tests/malloc_hooks_tests.cpp
parente6c51c05babb1456af3814cf02deb257cba3c903 (diff)
parent2b2e1aa5d5b7280b80a7ad51862b4cbfc16a79fe (diff)
Merge TP1A.220209.001
Change-Id: I2621ede1aae716adf4da1d94ce00a98978713a81
Diffstat (limited to 'libc/malloc_hooks/tests/malloc_hooks_tests.cpp')
-rw-r--r--libc/malloc_hooks/tests/malloc_hooks_tests.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libc/malloc_hooks/tests/malloc_hooks_tests.cpp b/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
index 18587819a..ca064c2fe 100644
--- a/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
+++ b/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
@@ -350,6 +350,9 @@ TEST_F(MallocHooksTest, aligned_alloc_hook_error) {
RunTest("*.DISABLED_aligned_alloc_hook_error");
}
+// Allow deliberate call with non-power-of-two alignment in test code.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnon-power-of-two-alignment"
TEST_F(MallocHooksTest, DISABLED_aligned_alloc_hook_error) {
Init();
ASSERT_TRUE(__memalign_hook != nullptr);
@@ -365,6 +368,7 @@ TEST_F(MallocHooksTest, DISABLED_aligned_alloc_hook_error) {
EXPECT_FALSE(void_arg_ != nullptr)
<< "The memalign hook was called with a nullptr with an error.";
}
+#pragma clang diagnostic pop
#if !defined(__LP64__)
TEST_F(MallocHooksTest, pvalloc_hook) {