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/string_test.cpp | |
| parent | 5ee320dd35fafc11eaf90c62198e08c6670e35b4 (diff) | |
| download | bionic-a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.zip bionic-a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.tar.gz bionic-a04d2bc28e7d7fcaf34ad71e4a6608a13cf84197.tar.bz2 | |
Backing this one out since the counterpart needs to be sent upstream.
This reverts commit 5ee320dd35fafc11eaf90c62198e08c6670e35b4.
Change-Id: I1a9c6b06c3aca595f01c629f7649be743dc48e77
Diffstat (limited to 'tests/string_test.cpp')
| -rw-r--r-- | tests/string_test.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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 @@ struct StringTestState { 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(); |