From 3b693f40840ff09b1965b9626d3220466daa95d6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 1 Oct 2011 10:50:57 +0200 Subject: [PATCH] mkfifoat tests: Fix a test failure on mingw. * tests/test-mkfifoat.c (main): Allow mkfifoat or test_mknodat to fail with error ENOSYS. --- ChangeLog | 6 ++++++ tests/test-mkfifoat.c | 57 +++++++++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c13f7878..a07066905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-10-01 Bruno Haible + + mkfifoat tests: Fix a test failure on mingw. + * tests/test-mkfifoat.c (main): Allow mkfifoat or test_mknodat to fail + with error ENOSYS. + 2011-09-30 Bruno Haible float, math: Fix 'int' to 'long double' conversion on Linux/SPARC64. diff --git a/tests/test-mkfifoat.c b/tests/test-mkfifoat.c index 4872be99c..4a8edd1dc 100644 --- a/tests/test-mkfifoat.c +++ b/tests/test-mkfifoat.c @@ -106,32 +106,41 @@ main (void) } /* Create fifo while cwd is '.', then stat it from '..'. */ - ASSERT (func (AT_FDCWD, BASE "fifo", 0600) == 0); - errno = 0; - ASSERT (func (dfd, BASE "fifo", 0600) == -1); - ASSERT (errno == EEXIST); - ASSERT (chdir ("..") == 0); - errno = 0; - ASSERT (fstatat (AT_FDCWD, BASE "fifo", &st, 0) == -1); - ASSERT (errno == ENOENT); - memset (&st, 0, sizeof st); - ASSERT (fstatat (dfd, BASE "fifo", &st, 0) == 0); - ASSERT (S_ISFIFO (st.st_mode)); - ASSERT (unlinkat (dfd, BASE "fifo", 0) == 0); + if (func (AT_FDCWD, BASE "fifo", 0600) != 0) + ASSERT (errno == ENOSYS); /* seen on native Windows */ + else + { + errno = 0; + ASSERT (func (dfd, BASE "fifo", 0600) == -1); + ASSERT (errno == EEXIST); + ASSERT (chdir ("..") == 0); + errno = 0; + ASSERT (fstatat (AT_FDCWD, BASE "fifo", &st, 0) == -1); + ASSERT (errno == ENOENT); + memset (&st, 0, sizeof st); + ASSERT (fstatat (dfd, BASE "fifo", &st, 0) == 0); + ASSERT (S_ISFIFO (st.st_mode)); + ASSERT (unlinkat (dfd, BASE "fifo", 0) == 0); + } /* Create fifo while cwd is '..', then stat it from '.'. */ - ASSERT (func (dfd, BASE "fifo", 0600) == 0); - ASSERT (fchdir (dfd) == 0); - errno = 0; - ASSERT (func (AT_FDCWD, BASE "fifo", 0600) == -1); - ASSERT (errno == EEXIST); - memset (&st, 0, sizeof st); - ASSERT (fstatat (AT_FDCWD, BASE "fifo", &st, AT_SYMLINK_NOFOLLOW) == 0); - ASSERT (S_ISFIFO (st.st_mode)); - memset (&st, 0, sizeof st); - ASSERT (fstatat (dfd, BASE "fifo", &st, AT_SYMLINK_NOFOLLOW) == 0); - ASSERT (S_ISFIFO (st.st_mode)); - ASSERT (unlink (BASE "fifo") == 0); + if (func (dfd, BASE "fifo", 0600) != 0) + ASSERT (errno == ENOSYS); /* seen on native Windows */ + else + { + ASSERT (fchdir (dfd) == 0); + errno = 0; + ASSERT (func (AT_FDCWD, BASE "fifo", 0600) == -1); + ASSERT (errno == EEXIST); + memset (&st, 0, sizeof st); + ASSERT (fstatat (AT_FDCWD, BASE "fifo", &st, AT_SYMLINK_NOFOLLOW) + == 0); + ASSERT (S_ISFIFO (st.st_mode)); + memset (&st, 0, sizeof st); + ASSERT (fstatat (dfd, BASE "fifo", &st, AT_SYMLINK_NOFOLLOW) == 0); + ASSERT (S_ISFIFO (st.st_mode)); + ASSERT (unlink (BASE "fifo") == 0); + } } ASSERT (close (dfd) == 0); -- 2.11.0