summaryrefslogtreecommitdiff
path: root/libc/malloc_hooks/tests/malloc_hooks_tests.cpp
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2022-03-21 22:02:18 -0700
committerLinux Build Service Account <lnxbuild@localhost>2022-03-21 22:02:18 -0700
commit34a394fe826dbaa25a992fccb525f2747980e789 (patch)
tree496070d391f4ac60801d59b6a174101144e60da8 /libc/malloc_hooks/tests/malloc_hooks_tests.cpp
parentcb1ca49aa7213af91ec4fd79562f61ff10ec2d6b (diff)
parentfdb4e0ed7a5fea943b4ebe947e19ecb94d98bf8a (diff)
Merge fdb4e0ed7a5fea943b4ebe947e19ecb94d98bf8a on remote branch
Change-Id: I8a196f6570acd8e6f19303d3786f014587a6475e
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) {