diff options
| author | Elliott Hughes <enh@google.com> | 2014-09-08 23:46:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-08 23:46:04 +0000 |
| commit | 201f36d23bb778b29c8d305fa40a41990e0487bc (patch) | |
| tree | 15682b74fd20e0a37c8d6cef63bba9e05df7145f /tests | |
| parent | d3d89f0d28aba2db9f11cc0a9b3a865fa1d9d265 (diff) | |
| parent | cf5fc80c3eb710cb5a1985837156cb2758c87a5b (diff) | |
| download | android_bionic-201f36d23bb778b29c8d305fa40a41990e0487bc.tar.gz android_bionic-201f36d23bb778b29c8d305fa40a41990e0487bc.tar.bz2 android_bionic-201f36d23bb778b29c8d305fa40a41990e0487bc.zip | |
Merge "Don't expose non-standard basename_r and dirname_r in LP64."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libgen_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/libgen_test.cpp b/tests/libgen_test.cpp index d0402dbf6..e9a5d5c44 100644 --- a/tests/libgen_test.cpp +++ b/tests/libgen_test.cpp @@ -63,7 +63,7 @@ TEST(libgen, dirname) { TestDirname("/", "/"); } -#if defined(__BIONIC__) +#if defined(__BIONIC__) && !defined(__LP64__) static void TestBasename(const char* in, const char* expected_out, int expected_rc, char* buf, size_t buf_size, int expected_errno) { errno = 0; @@ -88,7 +88,7 @@ static void TestDirname(const char* in, const char* expected_out, int expected_r #endif // __BIONIC__ TEST(libgen, basename_r) { -#if defined(__BIONIC__) +#if defined(__BIONIC__) && !defined(__LP64__) char buf[256]; TestBasename("", ".", 1, NULL, 0, 0); TestBasename("", ".", -1, buf, 0, ERANGE); @@ -107,7 +107,7 @@ TEST(libgen, basename_r) { } TEST(libgen, dirname_r) { -#if defined(__BIONIC__) +#if defined(__BIONIC__) && !defined(__LP64__) char buf[256]; TestDirname("", ".", 1, NULL, 0, 0); TestDirname("", ".", -1, buf, 0, ERANGE); |