diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-04 16:47:56 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-04 16:47:56 +0000 |
| commit | 3c2d6610b4f395363fd8c565af496d279ab44162 (patch) | |
| tree | 4233fb25eabacbc7092f9d59c5ffa87b494a1e16 /contrib/netbsd-tests/lib/libc/gen/t_ttyname.c | |
| parent | 1a9602695754476d7f89f486f4e040cd432243ef (diff) | |
| download | FreeBSD-src-3c2d6610b4f395363fd8c565af496d279ab44162.zip FreeBSD-src-3c2d6610b4f395363fd8c565af496d279ab44162.tar.gz | |
MFC r311925,r311968,r311969,r312102,r312108:
r311925:
Import testcase updates with code contributed back to NetBSD
This also (inadvertently) contains an update to
contrib/netbsd-tests/lib/libc/sys/t_wait.c (new testcases).
In collaboration with: christos@NetBSD.org
r311968:
Fix lib/libc/sys/access_test after r311925
sys/param.h needs to be #included in order for __FreeBSD_version to be checked
r311969:
Remove __HAVE_LONG_DOUBLE #define from t_strtod.c and place it in Makefile
This is to enable support in other testcases
Inspired by lib/msun/tests/Makefile .
r312102:
Note that sys/types.h is required on FreeBSD for kqueue(2), unlike NetBSD
r312108:
Delete trailing whitespace and use __arraycount instead of nitems in contrib code
Diffstat (limited to 'contrib/netbsd-tests/lib/libc/gen/t_ttyname.c')
| -rw-r--r-- | contrib/netbsd-tests/lib/libc/gen/t_ttyname.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c b/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c index 1c813fb..61121b8 100644 --- a/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c +++ b/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_ttyname.c,v 1.3 2011/05/01 18:14:01 jruoho Exp $ */ +/* $NetBSD: t_ttyname.c,v 1.4 2017/01/10 15:33:40 christos Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: t_ttyname.c,v 1.3 2011/05/01 18:14:01 jruoho Exp $"); +__RCSID("$NetBSD: t_ttyname.c,v 1.4 2017/01/10 15:33:40 christos Exp $"); #include <atf-c.h> #include <errno.h> @@ -78,9 +78,7 @@ ATF_TC_BODY(ttyname_err, tc) ATF_REQUIRE(ttyname(fd) == NULL); ATF_REQUIRE(errno == ENOTTY); -#ifdef __FreeBSD__ (void)close(fd); -#endif } } |
