From: Garrett C. <su...@li...> - 2010-10-27 14:59:37
|
The branch, master, has been updated via 332cdb8e48d7380d2a11ec7ef96a2bf44b6da9ea (commit) via b156e1d9df94b45b5e39fd8dcafc82b42d818f6c (commit) from da908058635ca58caf3e85814f2eba68febad1e1 (commit) - Log ----------------------------------------------------------------- commit 332cdb8e48d7380d2a11ec7ef96a2bf44b6da9ea Author: Garrett Cooper <yan...@gm...> Date: Wed Oct 27 07:58:15 2010 -0700 Work w/ optional implementation defined behavior. Mark many of the testcases that were PTS_FAIL previously with optional implementation defined behavior as PTS_UNRESOLVED. Signed-off-by: Garrett Cooper <yan...@gm...> commit b156e1d9df94b45b5e39fd8dcafc82b42d818f6c Author: Garrett Cooper <yan...@gm...> Date: Wed Oct 27 07:17:35 2010 -0700 Make opt. behavior failure unresolved instead. Wording in POSIX 2008.1 states: The aio_return() function may be called exactly once to retrieve the return status of a given asynchronous operation. It seems like loose wording, but for now it's optional implementation defined behavior, so mark the failure optional. Signed-off-by: Garrett Cooper <yan...@gm...> ----------------------------------------------------------------------- Summary of changes: .../conformance/interfaces/aio_return/2-1.c | 4 ++-- .../conformance/interfaces/aio_return/3-1.c | 11 ++++++----- .../conformance/interfaces/aio_return/3-2.c | 4 ++-- .../conformance/interfaces/aio_return/4-1.c | 8 ++++---- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c index 4ac81e7..8f74a0b 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/2-1.c @@ -88,10 +88,10 @@ int main(void) if (retval != -1) { close(fd); - printf(TNAME " Second call to aio_return() should " + printf(TNAME " Second call to aio_return() may " "return -1; aio_return() returned %d\n", retval); - exit(PTS_FAIL); + exit(PTS_UNRESOLVED); } } else { diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c index 864132d..c0d5eb1 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-1.c @@ -68,7 +68,7 @@ int main(void) aiocb.aio_fildes = fd; aiocb.aio_buf = buf; aiocb.aio_nbytes = BUF_SIZE; - + if (aio_write(&aiocb) == -1) { close(fd); printf(TNAME " Error at aio_write(): %s\n", @@ -107,14 +107,15 @@ int main(void) close(fd); printf(TNAME " Error at aio_return(): %s\n", strerror(aio_error(&aiocb))); - exit(PTS_FAIL); + exit(PTS_UNRESOLVED); } else { if (retval != (BUF_SIZE / 2)) { close(fd); - printf(TNAME " Error at aio_return(): %d, %s\n", - retval, strerror(aio_error(&aiocb))); - exit(PTS_FAIL); + printf(TNAME " aio_return() didn't fail as expected: " + "%d, %s\n", + retval, strerror(aio_error(&aiocb))); + exit(PTS_UNRESOLVED); } } diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c index c18e0ef..14fd461 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/3-2.c @@ -95,10 +95,10 @@ int main(void) if (retval != -1 && aio_error(&aiocb) != EINVAL) { close(fd); - printf(TNAME " aio_return() should fail with (-1, %d); " + printf(TNAME " aio_return() may fail with (-1, %d); " "failed with (%d, %d) instead\n", EINVAL, retval, aio_error(&aiocb)); - exit(PTS_FAIL); + exit(PTS_UNRESOLVED); } } diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c index 412dde0..c7d456b 100644 --- a/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c +++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_return/4-1.c @@ -87,10 +87,10 @@ int main(void) retval = aio_return(&aiocb2); - if (retval != -1) { + if (retval != -1 || aio_error(&aiocb) != EINVAL) { close(fd); - printf(TNAME " aio_return() should fail\n"); - exit(PTS_FAIL); + printf(TNAME " aio_return() may fail\n"); + exit(PTS_UNRESOLVED); } retval = aio_return(&aiocb); @@ -99,7 +99,7 @@ int main(void) close(fd); printf(TNAME " Error at aio_return(): %d, %s\n", retval, strerror(aio_error(&aiocb))); - exit(PTS_FAIL); + exit(PTS_UNRESOLVED); } } else { hooks/post-receive -- ltp |