From 313a7306cf97fc82111d1e865e067dcd39e38b60 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 31 Jul 2010 22:43:19 +0200 Subject: [PATCH] readlink, areadlink: Relax test a bit. --- ChangeLog | 8 ++++++++ tests/test-areadlink.h | 2 +- tests/test-readlink.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a0f040d4..09bf87f6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-07-31 Bruno Haible + readlink, areadlink: Relax test a bit. + * tests/test-readlink.h (test_readlink): Accept EINVAL as an + alternative to ENOTDIR. + * tests/test-areadlink.h (test_areadlink): Likewise. + Reported by Rainer Tammer. + +2010-07-31 Bruno Haible + unistr/u8-strstr, unistr/u16-strstr: Optimize the one-character case. * lib/unistr/u-strstr.h (FUNC): When the needle contains only one character, perform the search using U_STRCHR. diff --git a/tests/test-areadlink.h b/tests/test-areadlink.h index 5e2a643b4..9ad801998 100644 --- a/tests/test-areadlink.h +++ b/tests/test-areadlink.h @@ -49,7 +49,7 @@ test_areadlink (char * (*func) (char const *, size_t), bool print) ASSERT (errno == EINVAL); errno = 0; ASSERT (func (BASE "file/", 1) == NULL); - ASSERT (errno == ENOTDIR); + ASSERT (errno == ENOTDIR || errno == EINVAL); /* AIX yields EINVAL */ ASSERT (unlink (BASE "file") == 0); /* Now test actual symlinks. */ diff --git a/tests/test-readlink.h b/tests/test-readlink.h index d96017503..6397fa4af 100644 --- a/tests/test-readlink.h +++ b/tests/test-readlink.h @@ -74,7 +74,7 @@ test_readlink (ssize_t (*func) (char const *, char *, size_t), bool print) ASSERT (symlink (BASE "file", BASE "link2") == 0); errno = 0; ASSERT (func (BASE "link2/", buf, sizeof buf) == -1); - ASSERT (errno == ENOTDIR); + ASSERT (errno == ENOTDIR || errno == EINVAL); /* AIX yields EINVAL */ ASSERT (unlink (BASE "file") == 0); ASSERT (unlink (BASE "link2") == 0); { -- 2.11.0