From owner-svn-src-all@FreeBSD.ORG  Fri Jul  8 12:16:31 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 598AF106564A;
	Fri,  8 Jul 2011 12:16:31 +0000 (UTC)
	(envelope-from jonathan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4970C8FC13;
	Fri,  8 Jul 2011 12:16:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p68CGVmY017245;
	Fri, 8 Jul 2011 12:16:31 GMT (envelope-from jonathan@svn.freebsd.org)
Received: (from jonathan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p68CGVtZ017242;
	Fri, 8 Jul 2011 12:16:31 GMT (envelope-from jonathan@svn.freebsd.org)
Message-Id: <201107081216.p68CGVtZ017242@svn.freebsd.org>
From: Jonathan Anderson <jonathan@FreeBSD.org>
Date: Fri, 8 Jul 2011 12:16:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223865 - head/tools/regression/kqueue
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jul 2011 12:16:31 -0000

Author: jonathan
Date: Fri Jul  8 12:16:30 2011
New Revision: 223865
URL: http://svn.freebsd.org/changeset/base/223865

Log:
  Clarify the meaning of a test.
  
  Rather than using err() if either of two failure conditions
  fires (which can produce spurious error messages), just use
  errx() if the one condition that really matters fires.
  
  In practice, this single test is enough to detect the failure
  mode we're looking for (kqueue being inherited across fork).
  
  Approved by: mentor (rwatson), re (Capsicum blanket)
  Sponsored by: Google Inc

Modified:
  head/tools/regression/kqueue/config.h
  head/tools/regression/kqueue/proc.c

Modified: head/tools/regression/kqueue/config.h
==============================================================================
--- head/tools/regression/kqueue/config.h	Fri Jul  8 10:58:56 2011	(r223864)
+++ head/tools/regression/kqueue/config.h	Fri Jul  8 12:16:30 2011	(r223865)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+/* $FreeBSD$ */
 
 #define HAVE_ERR_H 1
 #define HAVE_SYS_EVENT_H 1

Modified: head/tools/regression/kqueue/proc.c
==============================================================================
--- head/tools/regression/kqueue/proc.c	Fri Jul  8 10:58:56 2011	(r223864)
+++ head/tools/regression/kqueue/proc.c	Fri Jul  8 12:16:30 2011	(r223865)
@@ -43,9 +43,9 @@ add_and_delete(void)
     pid = fork();
     if (pid == 0) {
         struct stat s;
-        if ((fstat(kqfd, &s) != -1) || (errno != EBADF))
-            err(1, "%s:%d - %s: fstat(kqfd) in child did not return EBADF",
-                __FILE__, __LINE__, __func__);
+        if (fstat(kqfd, &s) != -1)
+            errx(1, "kqueue inherited across fork! (%s() at %s:%d)",
+	        __func__, __FILE__, __LINE__);
 
         pause();
         exit(2);