diff options
| author | Dan Albert <danalbert@google.com> | 2014-06-14 00:51:14 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-06-14 00:51:14 +0000 |
| commit | a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197 (patch) | |
| tree | 729a98533b9d101d029556ca290d9524bd4b416e /tests/malloc_test.cpp | |
| parent | 5ee320dd35fafc11eaf90c62198e08c6670e35b4 (diff) | |
| download | android_bionic-a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.tar.gz android_bionic-a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.tar.bz2 android_bionic-a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.zip | |
Backing this one out since the counterpart needs to be sent upstream.
This reverts commit 5ee320dd35fafc11eaf90c62198e08c6670e35b4.
Change-Id: I1a9c6b06c3aca595f01c629f7649be743dc48e77
Diffstat (limited to 'tests/malloc_test.cpp')
| -rw-r--r-- | tests/malloc_test.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp index d70136496..ed98f15d3 100644 --- a/tests/malloc_test.cpp +++ b/tests/malloc_test.cpp @@ -22,10 +22,6 @@ #include <malloc.h> #include <unistd.h> -#if defined(__BIONIC__) -#include <libc/bionic/malloc_debug_common.h> -#endif - TEST(malloc, malloc_std) { // Simple malloc test. void *ptr = malloc(100); @@ -295,10 +291,6 @@ TEST(malloc, realloc_overflow) { free(ptr); } -#if defined(HAVE_DEPRECATED_MALLOC_FUNCS) -extern "C" void* pvalloc(size_t); -extern "C" void* valloc(size_t); - TEST(malloc, pvalloc_std) { size_t pagesize = sysconf(_SC_PAGESIZE); void* ptr = pvalloc(100); @@ -323,4 +315,3 @@ TEST(malloc, valloc_std) { TEST(malloc, valloc_overflow) { ASSERT_EQ(NULL, valloc(SIZE_MAX)); } -#endif |