From owner-svn-src-all@FreeBSD.ORG Wed Feb 26 09:08:26 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D7E4800; Wed, 26 Feb 2014 09:08:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08BCD1D6E; Wed, 26 Feb 2014 09:08:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1Q98PFK014923; Wed, 26 Feb 2014 09:08:25 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1Q98P9d014921; Wed, 26 Feb 2014 09:08:25 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201402260908.s1Q98P9d014921@svn.freebsd.org> From: Peter Holm Date: Wed, 26 Feb 2014 09:08:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262526 - head/tests/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Feb 2014 09:08:26 -0000 Author: pho Date: Wed Feb 26 09:08:25 2014 New Revision: 262526 URL: http://svnweb.freebsd.org/changeset/base/262526 Log: Added a regression test for r234131. Discussed with: asomers Sponsored by: EMC / Isilon storage division Added: head/tests/sys/kern/kern_descrip_test.c (contents, props changed) Modified: head/tests/sys/kern/Makefile Modified: head/tests/sys/kern/Makefile ============================================================================== --- head/tests/sys/kern/Makefile Wed Feb 26 09:06:57 2014 (r262525) +++ head/tests/sys/kern/Makefile Wed Feb 26 09:08:25 2014 (r262526) @@ -2,7 +2,8 @@ TESTSDIR= ${TESTSBASE}/sys/kern -ATF_TESTS_C= unix_seqpacket_test +ATF_TESTS_C+= kern_descrip_test +ATF_TESTS_C+= unix_seqpacket_test TEST_METADATA.unix_seqpacket_test+= timeout="15" LDADD+= -lpthread Added: head/tests/sys/kern/kern_descrip_test.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tests/sys/kern/kern_descrip_test.c Wed Feb 26 09:08:25 2014 (r262526) @@ -0,0 +1,80 @@ +/*- + * Copyright (c) 2013 EMC Corp. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +ATF_TC_WITHOUT_HEAD(dup2_simple); +ATF_TC_BODY(dup2_simple, tc) +{ + int fd1, fd2; + struct stat sb1, sb2; + + fd1 = open("/etc/passwd", O_RDONLY); + ATF_REQUIRE(fd1 >= 0); + fd2 = 27; + ATF_REQUIRE(dup2(fd1, fd2) != -1); + ATF_REQUIRE(fstat(fd1, &sb1) != -1); + ATF_REQUIRE(fstat(fd2, &sb2) != -1); + ATF_REQUIRE(bcmp(&sb1, &sb2, sizeof(sb1)) == 0); +} + +/* + Regression test for r234131: + Return EBADF instead of EMFILE from dup2 when the second argument is + outside the range of valid file descriptors + */ + +ATF_TC_WITHOUT_HEAD(dup2_r234131); +ATF_TC_BODY(dup2_r234131, tc) +{ + int fd1, fd2, ret; + + fd1 = open("/etc/passwd", O_RDONLY); + fd2 = INT_MAX; + ret = dup2(fd1, fd2); + ATF_CHECK_EQ(-1, ret); + ATF_CHECK_EQ(EBADF, errno); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dup2_simple); + ATF_TP_ADD_TC(tp, dup2_r234131); + + return atf_no_error(); +}