From f4d6a0d4e1b1a217a64e29a9a592a254255e5333 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 8 Oct 2015 14:44:15 +0000 Subject: [PATCH] tests: fix false uio.test failures * tests/uio.c (main): Use descriptor number 0 in pread/pwrite and preadv/pwritev syscalls. * tests/uio.expected: Update regexps. Reported-by: Lennart Sorensen --- tests/uio.c | 18 +++++++++--------- tests/uio.expected | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/uio.c b/tests/uio.c index aac123a6..fc5eae3d 100644 --- a/tests/uio.c +++ b/tests/uio.c @@ -11,19 +11,19 @@ main(void) { #if defined(HAVE_PREADV) && defined(HAVE_PWRITEV) const off_t offset = 0xdefaceddeadbeefLL; - int fd; char buf[4]; struct iovec iov = { buf, sizeof buf }; - assert((fd = open("/dev/zero", O_RDONLY)) >= 0); - assert(pread(fd, buf, sizeof buf, offset) == 4); - assert(preadv(fd, &iov, 1, offset) == 4); - assert(!close(fd)); + (void) close(0); + assert(open("/dev/zero", O_RDONLY) == 0); + assert(pread(0, buf, sizeof buf, offset) == 4); + assert(preadv(0, &iov, 1, offset) == 4); + assert(!close(0)); - assert((fd = open("/dev/null", O_WRONLY)) >= 0); - assert(pwrite(fd, buf, sizeof buf, offset) == 4); - assert(pwritev(fd, &iov, 1, offset) == 4); - assert(!close(fd)); + assert(open("/dev/null", O_WRONLY) == 0); + assert(pwrite(0, buf, sizeof buf, offset) == 4); + assert(pwritev(0, &iov, 1, offset) == 4); + assert(!close(0)); return 0; #else diff --git a/tests/uio.expected b/tests/uio.expected index 999b88cc..b4aa5474 100644 --- a/tests/uio.expected +++ b/tests/uio.expected @@ -1,4 +1,4 @@ -pread(64)?\(3, "\\0\\0\\0\\0", 4, 1004211379570065135\) += 4 -preadv\(3, \[{"\\0\\0\\0\\0", 4}\], 1, 1004211379570065135\) += 4 -pwrite(64)?\(3, "\\0\\0\\0\\0", 4, 1004211379570065135\) += 4 -pwritev\(3, \[{"\\0\\0\\0\\0", 4}\], 1, 1004211379570065135\) += 4 +pread(64)?\(0, "\\0\\0\\0\\0", 4, 1004211379570065135\) += 4 +preadv\(0, \[{"\\0\\0\\0\\0", 4}\], 1, 1004211379570065135\) += 4 +pwrite(64)?\(0, "\\0\\0\\0\\0", 4, 1004211379570065135\) += 4 +pwritev\(0, \[{"\\0\\0\\0\\0", 4}\], 1, 1004211379570065135\) += 4 -- 2.40.0