Merge "Silence -Wnon-power-of-two-alignment for a test" am: 650233457a
am: 64a42f33ed
am: b6761c1350
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1964751 Change-Id: I5bbc9cbc70d612b729e18bfa1ea03f81493207e4
This commit is contained in:
commit
94c1039259
1 changed files with 4 additions and 0 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue