diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-09 11:26:48 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-09 11:26:48 -0200 |
| commit | 4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (patch) | |
| tree | 4c2ece480e5d4155ed35bec62996de40eb179f18 /contrib/netbsd-tests/lib/libc/sys | |
| parent | 681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (diff) | |
| parent | a1e52233c91fd46e666297270ab655f1abff8535 (diff) | |
| download | FreeBSD-src-4a05f5440acda223e6a0ec5157bc32ecc0f09ff9.zip FreeBSD-src-4a05f5440acda223e6a0ec5157bc32ecc0f09ff9.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/netbsd-tests/lib/libc/sys')
| -rw-r--r-- | contrib/netbsd-tests/lib/libc/sys/t_select.c | 6 | ||||
| -rw-r--r-- | contrib/netbsd-tests/lib/libc/sys/t_unlink.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/contrib/netbsd-tests/lib/libc/sys/t_select.c b/contrib/netbsd-tests/lib/libc/sys/t_select.c index 7af725a..437b67b 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_select.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_select.c @@ -135,6 +135,9 @@ child(const struct timespec *ts) "after timeout %s != %s", prmask(&nset, nbuf, sizeof(nbuf)), prmask(&oset, obuf, sizeof(obuf))); +#ifdef __FreeBSD__ + _exit(0); +#endif } ATF_TC(pselect_sigmask); @@ -154,6 +157,9 @@ ATF_TC_BODY(pselect_sigmask, tc) switch (pid = fork()) { case 0: child(NULL); +#ifdef __FreeBSD__ + break; +#endif case -1: err(1, "fork"); default: diff --git a/contrib/netbsd-tests/lib/libc/sys/t_unlink.c b/contrib/netbsd-tests/lib/libc/sys/t_unlink.c index 8d94668..b504bb0 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_unlink.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_unlink.c @@ -111,8 +111,15 @@ ATF_TC_HEAD(unlink_fifo, tc) ATF_TC_BODY(unlink_fifo, tc) { +#ifdef __FreeBSD__ + int fd; + ATF_REQUIRE_MSG((fd = mkfifo(path, 0666)) == 0, + "mkfifo failed: %s", strerror(errno)); + (void)close(fd); +#else ATF_REQUIRE(mkfifo(path, 0666) == 0); +#endif ATF_REQUIRE(unlink(path) == 0); errno = 0; |
