diff options
author | Christopher Ferris <cferris@google.com> | 2017-05-06 06:30:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-06 06:30:41 +0000 |
commit | 9a4f572a9551c925c75fb47be901813082f2a1f4 (patch) | |
tree | 3a74f0ea6ea5d219c970cd428b35df1178eb9931 /libmemunreachable | |
parent | ddfd5056a29ad8a92cee075a558129cee7c64a84 (diff) | |
parent | 47e02f429d049d42afd4e10203aa64ae1c229032 (diff) | |
download | system_core-9a4f572a9551c925c75fb47be901813082f2a1f4.tar.gz system_core-9a4f572a9551c925c75fb47be901813082f2a1f4.tar.bz2 system_core-9a4f572a9551c925c75fb47be901813082f2a1f4.zip |
Merge "Small test fixes."
Diffstat (limited to 'libmemunreachable')
-rw-r--r-- | libmemunreachable/tests/DisableMalloc_test.cpp | 4 | ||||
-rw-r--r-- | libmemunreachable/tests/MemUnreachable_test.cpp | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libmemunreachable/tests/DisableMalloc_test.cpp b/libmemunreachable/tests/DisableMalloc_test.cpp index ea5c22c88..4e6155b81 100644 --- a/libmemunreachable/tests/DisableMalloc_test.cpp +++ b/libmemunreachable/tests/DisableMalloc_test.cpp @@ -74,7 +74,7 @@ TEST_F(DisableMallocTest, deadlock_new) { { alarm(100ms); ScopedDisableMalloc disable_malloc; - char* ptr = new(char); + char* ptr = new (std::nothrow)(char); ASSERT_NE(ptr, nullptr); delete(ptr); } @@ -89,6 +89,8 @@ TEST_F(DisableMallocTest, deadlock_delete) { alarm(250ms); ScopedDisableMalloc disable_malloc; delete(ptr); + // Force ptr usage or this code gets optimized away by the arm64 compiler. + ASSERT_NE(ptr, nullptr); } }, ""); } diff --git a/libmemunreachable/tests/MemUnreachable_test.cpp b/libmemunreachable/tests/MemUnreachable_test.cpp index 2ae3db83e..71da3655a 100644 --- a/libmemunreachable/tests/MemUnreachable_test.cpp +++ b/libmemunreachable/tests/MemUnreachable_test.cpp @@ -23,8 +23,6 @@ #include <memunreachable/memunreachable.h> -void* ptr; - class HiddenPointer { public: explicit HiddenPointer(size_t size = 256) { @@ -92,10 +90,12 @@ TEST(MemunreachableTest, stack) { } } +void* g_ptr; + TEST(MemunreachableTest, global) { HiddenPointer hidden_ptr; - ptr = hidden_ptr.Get(); + g_ptr = hidden_ptr.Get(); { UnreachableMemoryInfo info; @@ -104,7 +104,7 @@ TEST(MemunreachableTest, global) { ASSERT_EQ(0U, info.leaks.size()); } - ptr = NULL; + g_ptr = nullptr; { UnreachableMemoryInfo info; @@ -126,7 +126,7 @@ TEST(MemunreachableTest, global) { TEST(MemunreachableTest, tls) { HiddenPointer hidden_ptr; pthread_key_t key; - pthread_key_create(&key, NULL); + pthread_key_create(&key, nullptr); pthread_setspecific(key, hidden_ptr.Get()); |