From owner-svn-src-head@freebsd.org  Wed Jan 11 07:22:22 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7545ACAA888;
 Wed, 11 Jan 2017 07:22:22 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 423011621;
 Wed, 11 Jan 2017 07:22:22 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0B7MLxQ035454;
 Wed, 11 Jan 2017 07:22:21 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0B7MLGi035453;
 Wed, 11 Jan 2017 07:22:21 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701110722.v0B7MLGi035453@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Wed, 11 Jan 2017 07:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311919 - head/contrib/netbsd-tests/lib/libc/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2017 07:22:22 -0000

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)