Date: Sat, 1 Nov 2014 17:19:44 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r273937 - head/contrib/netbsd-tests/lib/libc/sys Message-ID: <201411011719.sA1HJiua035650@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Nov 1 17:19:43 2014 New Revision: 273937 URL: https://svnweb.freebsd.org/changeset/base/273937 Log: Port lib/libc/sys/t_dup to FreeBSD/Linux - The requirements differ between FreeBSD/Linux when dealing with oldd/newd being equal (both fail with EINVAL, not EBADF) - Add an EBADF testcase - Fix compilation issues on clang In collaboration with: pho Modified: head/contrib/netbsd-tests/lib/libc/sys/t_dup.c Modified: head/contrib/netbsd-tests/lib/libc/sys/t_dup.c ============================================================================== --- head/contrib/netbsd-tests/lib/libc/sys/t_dup.c Sat Nov 1 17:14:29 2014 (r273936) +++ head/contrib/netbsd-tests/lib/libc/sys/t_dup.c Sat Nov 1 17:19:43 2014 (r273937) @@ -45,8 +45,14 @@ __RCSID("$NetBSD: t_dup.c,v 1.8 2012/03/ #include <unistd.h> #include <sysexits.h> +#ifdef __FreeBSD__ +#include <stdbool.h> +#endif + static char path[] = "dup"; +#ifdef __NetBSD__ static void check_mode(bool, bool, bool); +#endif static void check_mode(bool _dup, bool _dup2, bool _dup3) @@ -207,10 +213,24 @@ ATF_TC_BODY(dup3_err, tc) ATF_REQUIRE(fd >= 0); errno = 0; +#if defined(__FreeBSD__) || defined(__linux__) + /* + * FreeBSD and linux return EINVAL, because... + * + * [EINVAL] The oldd argument is equal to the newd argument. + */ + ATF_REQUIRE(dup3(fd, fd, O_CLOEXEC) == -1); +#else ATF_REQUIRE(dup3(fd, fd, O_CLOEXEC) != -1); +#endif errno = 0; +#if defined(__FreeBSD__) || defined(__linux__) + ATF_REQUIRE_ERRNO(EINVAL, dup3(-1, -1, O_CLOEXEC) == -1); + ATF_REQUIRE_ERRNO(EBADF, dup3(fd, -1, O_CLOEXEC) == -1); +#else ATF_REQUIRE_ERRNO(EBADF, dup3(-1, -1, O_CLOEXEC) == -1); +#endif errno = 0; ATF_REQUIRE_ERRNO(EBADF, dup3(fd, -1, O_CLOEXEC) == -1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411011719.sA1HJiua035650>