Mercurial > gnulib
changeset 39221:f2c01d874a71
Avoid test failures on Microsoft Windows Subsystem for Linux.
* tests/test-fcntl.c (main): Allow a different errno.
* tests/test-rename.h (test_rename): Likewise.
* tests/test-renameat.c (main): Likewise.
* tests/test-renameat2.c (main): Likewise.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 22 Jan 2018 05:01:48 +0100 |
| parents | 5482976d0065 |
| children | 3c40257da226 |
| files | ChangeLog tests/test-fcntl.c tests/test-rename.h tests/test-renameat.c tests/test-renameat2.c |
| diffstat | 5 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jan 17 15:09:59 2018 -0800 +++ b/ChangeLog Mon Jan 22 05:01:48 2018 +0100 @@ -1,3 +1,11 @@ +2018-01-21 Bruno Haible <bruno@clisp.org> + + Avoid test failures on Microsoft Windows Subsystem for Linux. + * tests/test-fcntl.c (main): Allow a different errno. + * tests/test-rename.h (test_rename): Likewise. + * tests/test-renameat.c (main): Likewise. + * tests/test-renameat2.c (main): Likewise. + 2018-01-14 Paul Eggert <eggert@cs.ucla.edu> filenamecat: make base a suffix of result
--- a/tests/test-fcntl.c Wed Jan 17 15:09:59 2018 -0800 +++ b/tests/test-fcntl.c Mon Jan 22 05:01:48 2018 +0100 @@ -266,7 +266,8 @@ ASSERT (errno == EINVAL); errno = 0; ASSERT (fcntl (fd, F_DUPFD_CLOEXEC, bad_fd) == -1); - ASSERT (errno == EINVAL); + ASSERT (errno == EINVAL + || errno == EMFILE /* WSL */); /* For F_DUPFD*, check for correct inheritance, as well as preservation of text vs. binary. */
--- a/tests/test-rename.h Wed Jan 17 15:09:59 2018 -0800 +++ b/tests/test-rename.h Mon Jan 22 05:01:48 2018 +0100 @@ -339,12 +339,14 @@ errno = 0; ASSERT (func (BASE "dir2", BASE "dir/.") == -1); ASSERT (errno == EINVAL || errno == EBUSY || errno == EISDIR - || errno == ENOTEMPTY || errno == EEXIST); + || errno == ENOTEMPTY || errno == EEXIST + || errno == ENOENT /* WSL */); } { errno = 0; ASSERT (func (BASE "dir2/.", BASE "dir") == -1); - ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST); + ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST + || errno == ENOENT /* WSL */); } ASSERT (rmdir (BASE "dir") == 0); /* Files present here: @@ -366,12 +368,14 @@ errno = 0; ASSERT (func (BASE "dir2", BASE "dir/.//") == -1); ASSERT (errno == EINVAL || errno == EBUSY || errno == EISDIR - || errno == ENOTEMPTY || errno == EEXIST); + || errno == ENOTEMPTY || errno == EEXIST + || errno == ENOENT /* WSL */); } { errno = 0; ASSERT (func (BASE "dir2/.//", BASE "dir") == -1); - ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST); + ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST + || errno == ENOENT /* WSL */); } ASSERT (rmdir (BASE "dir2") == 0); /* Files present here:
--- a/tests/test-renameat.c Wed Jan 17 15:09:59 2018 -0800 +++ b/tests/test-renameat.c Mon Jan 22 05:01:48 2018 +0100 @@ -155,10 +155,12 @@ errno = 0; ASSERT (renameat (dfd, BASE "sub2", dfd, BASE "sub1/.") == -1); ASSERT (errno == EINVAL || errno == EISDIR || errno == EBUSY - || errno == ENOTEMPTY || errno == EEXIST); + || errno == ENOTEMPTY || errno == EEXIST + || errno == ENOENT /* WSL */); errno = 0; ASSERT (renameat (dfd, BASE "sub2/.", dfd, BASE "sub1") == -1); - ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST); + ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST + || errno == ENOENT /* WSL */); errno = 0; ASSERT (renameat (dfd, BASE "17", dfd, BASE "sub1") == -1); ASSERT (errno == EISDIR);
--- a/tests/test-renameat2.c Wed Jan 17 15:09:59 2018 -0800 +++ b/tests/test-renameat2.c Mon Jan 22 05:01:48 2018 +0100 @@ -158,10 +158,12 @@ errno = 0; ASSERT (renameat2 (dfd, BASE "sub2", dfd, BASE "sub1/.", 0) == -1); ASSERT (errno == EINVAL || errno == EISDIR || errno == EBUSY - || errno == ENOTEMPTY || errno == EEXIST); + || errno == ENOTEMPTY || errno == EEXIST + || errno == ENOENT /* WSL */); errno = 0; ASSERT (renameat2 (dfd, BASE "sub2/.", dfd, BASE "sub1", 0) == -1); - ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST); + ASSERT (errno == EINVAL || errno == EBUSY || errno == EEXIST + || errno == ENOENT /* WSL */); errno = 0; ASSERT (renameat2 (dfd, BASE "17", dfd, BASE "sub1", 0) == -1); ASSERT (errno == EISDIR);