commit a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197
author Dan Albert <danalbert@google.com> Sat Jun 14 00:51:14 2014 +0000
committer Dan Albert <danalbert@google.com> Sat Jun 14 00:51:14 2014 +0000
tree 729a98533b9d101d029556ca290d9524bd4b416e
parent 5ee320dd35fafc11eaf90c62198e08c6670e35b4

Backing this one out since the counterpart needs to be sent upstream.

This reverts commit 5ee320dd35fafc11eaf90c62198e08c6670e35b4.

Change-Id: I1a9c6b06c3aca595f01c629f7649be743dc48e77

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index ce0c5f2..c2e76b6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -115,18 +115,9 @@
 libBionicStandardTests_cflags := \
     $(test_cflags) \
 
-ifeq ($(MALLOC_IMPL),jemalloc)
-  libBionicStandardTests_cflags += -DUSE_JEMALLOC
-else
-  libBionicStandardTests_cflags += -DUSE_DLMALLOC
-endif
-
 libBionicStandardTests_cppflags := \
     $(test_cppflags) \
 
-libBionicStandardTests_c_includes := \
-    bionic/libc \
-
 libBionicStandardTests_ldlibs_host := \
     -lrt \
 

tests/malloc_test.cpp

diff --git a/tests/malloc_test.cpp b/tests/malloc_test.cpp
index d701364..ed98f15 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 @@
   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_overflow) {
   ASSERT_EQ(NULL, valloc(SIZE_MAX));
 }
-#endif

tests/string_test.cpp

diff --git a/tests/string_test.cpp b/tests/string_test.cpp
index 2ab60d7..a468b97 100644
--- a/tests/string_test.cpp
+++ b/tests/string_test.cpp
@@ -17,7 +17,6 @@
 #include <gtest/gtest.h>
 
 #include <errno.h>
-#include <malloc.h>
 #include <math.h>
 #include <string.h>
 
@@ -144,9 +143,9 @@
     int max_alignment = 64;
 
     // TODO: fix the tests to not sometimes use twice their specified "MAX_LEN".
-    glob_ptr = reinterpret_cast<Character*>(memalign(sysconf(_SC_PAGESIZE), 2 * sizeof(Character) * MAX_LEN + max_alignment));
-    glob_ptr1 = reinterpret_cast<Character*>(memalign(sysconf(_SC_PAGESIZE), 2 * sizeof(Character) * MAX_LEN + max_alignment));
-    glob_ptr2 = reinterpret_cast<Character*>(memalign(sysconf(_SC_PAGESIZE), 2 * sizeof(Character) * MAX_LEN + max_alignment));
+    glob_ptr = reinterpret_cast<Character*>(valloc(2 * sizeof(Character) * MAX_LEN + max_alignment));
+    glob_ptr1 = reinterpret_cast<Character*>(valloc(2 * sizeof(Character) * MAX_LEN + max_alignment));
+    glob_ptr2 = reinterpret_cast<Character*>(valloc(2 * sizeof(Character) * MAX_LEN + max_alignment));
 
     InitLenArray();