generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolved conflicts for merge of c8f6b82f to lmp-dev-plus-aosp

Browse Source 
Change-Id: I03a4645eb5fbb54e41da25018729b270ba0ed48e
This commit is contained in:
Elliott Hughes
2014-09-08 11:41:30 -07:00
parent ffa8672bd5 c8f6b82f87
commit 08df25419f
3 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/libgen_test.cpp
View File

@@ -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);