From owner-svn-src-head@freebsd.org  Tue Jan 10 10:17:00 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 7DF7BCA915A;
 Tue, 10 Jan 2017 10:17:00 +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 4E09B10F0;
 Tue, 10 Jan 2017 10:17:00 +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 v0AAGx5q012048;
 Tue, 10 Jan 2017 10:16:59 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0AAGxxI012047;
 Tue, 10 Jan 2017 10:16:59 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701101016.v0AAGxxI012047@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: Tue, 10 Jan 2017 10:16:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311871 - head/contrib/netbsd-tests/lib/libc/ttyio
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: Tue, 10 Jan 2017 10:17:00 -0000

Author: ngie
Date: Tue Jan 10 10:16:59 2017
New Revision: 311871
URL: https://svnweb.freebsd.org/changeset/base/311871

Log:
  Merge ^/vendor/NetBSD/tests/dist@r311868
  
  This is the vendor accepted version of ^/head@r311245
  
  MFC after:	3 days

Modified:
  head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
Directory Properties:
  head/contrib/netbsd-tests/   (props changed)

Modified: head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c	Tue Jan 10 10:12:36 2017	(r311870)
+++ head/contrib/netbsd-tests/lib/libc/ttyio/t_ttyio.c	Tue Jan 10 10:16:59 2017	(r311871)
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ttyio.c,v 1.2 2011/04/19 20:07:53 martin Exp $ */
+/*	$NetBSD: t_ttyio.c,v 1.3 2017/01/10 01:31:40 christos Exp $ */
 
 /*
  * Copyright (c) 2001, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include <sys/cdefs.h>
 __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ttyio.c,v 1.2 2011/04/19 20:07:53 martin Exp $");
+__RCSID("$NetBSD: t_ttyio.c,v 1.3 2017/01/10 01:31:40 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -150,11 +150,9 @@ ATF_TC_BODY(ioctl, tc)
 	/* wait for last child */
 	sa.sa_handler = SIG_DFL;
 	REQUIRE_ERRNO(sigaction(SIGCHLD, &sa, NULL), -1);
-	(void) wait(NULL);
+	(void)wait(NULL);
 
-#ifdef	__FreeBSD__
 	(void)close(s);
-#endif
 	ATF_REQUIRE_EQ(rc, 0);
 }