Author: ngie
Date: Wed Jan 11 07:22:21 2017
New Revision: 311919
URL: https://svnweb.freebsd.org/changeset/base/311919
Log:
Partially revert r311236
There's no sense in trying to close a file descriptor from the negative cases
with unlink_test; it's best to ignore these cases.
The mkfifo case does make sense to keep though.
MFC after: 3 days
Modified:
head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c
Modified: head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c Wed Jan 11 07:21:59
2017 (r311918)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_unlink.c Wed Jan 11 07:22:21
2017 (r311919)
@@ -63,12 +63,7 @@ ATF_TC_BODY(unlink_basic, tc)
ATF_REQUIRE(unlink(path) == 0);
errno = 0;
-#ifdef __FreeBSD__
- ATF_REQUIRE_ERRNO(ENOENT, (fd = open(path, O_RDONLY)) == -1);
- (void)close(fd);
-#else
ATF_REQUIRE_ERRNO(ENOENT, open(path, O_RDONLY) == -1);
-#endif
}
}
@@ -128,12 +123,7 @@ ATF_TC_BODY(unlink_fifo, tc)
ATF_REQUIRE(unlink(path) == 0);
errno = 0;
-#ifdef __FreeBSD__
- ATF_REQUIRE_ERRNO(ENOENT, (fd = open(path, O_RDONLY)) == -1);
- (void)close(fd);
-#else
ATF_REQUIRE_ERRNO(ENOENT, open(path, O_RDONLY) == -1);
-#endif
}
ATF_TC_CLEANUP(unlink_fifo, tc)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
