From owner-svn-src-stable@FreeBSD.ORG  Wed May 13 12:13:19 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 38D35320;
 Wed, 13 May 2015 12:13:19 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0C1C21EFD;
 Wed, 13 May 2015 12:13:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4DCDIbu046594;
 Wed, 13 May 2015 12:13:18 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4DCDITE046593;
 Wed, 13 May 2015 12:13:18 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201505131213.t4DCDITE046593@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 13 May 2015 12:13:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282859 - stable/10/tests/freebsd_test_suite
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 May 2015 12:13:19 -0000

Author: ngie
Date: Wed May 13 12:13:18 2015
New Revision: 282859
URL: https://svnweb.freebsd.org/changeset/base/282859

Log:
  MFC r282211,r282244:
  
  r282211:
  
  ATF_REQUIRE_KERNEL_MODULE: use atf_skip, not ATF_REQUIRE_MSG so the testcase
  no longer bombs out
  PLAIN_REQUIRE_KERNEL_MODULE: use printf + _exit, no err so the testcase no
  longer bombs out if it prints to stderr
  
  r282244:
  
  Fix typo. It should have been atf_tc_skip, not atf_skip
  
  Reported by: many, Jenkins
  Pointyhat to: ngie

Modified:
  stable/10/tests/freebsd_test_suite/macros.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/tests/freebsd_test_suite/macros.h
==============================================================================
--- stable/10/tests/freebsd_test_suite/macros.h	Wed May 13 12:09:01 2015	(r282858)
+++ stable/10/tests/freebsd_test_suite/macros.h	Wed May 13 12:13:18 2015	(r282859)
@@ -32,21 +32,24 @@
 #include <sys/param.h>
 #include <sys/module.h>
 #include <string.h>
-#include <err.h>
 #include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include <atf-c.h>
 
 #define	ATF_REQUIRE_KERNEL_MODULE(_mod_name) do {			\
-	ATF_REQUIRE_MSG(modfind(_mod_name) != -1,			\
-	    "module %s could not be resolved: %s",			\
-	    _mod_name, strerror(errno));				\
+	if (modfind(_mod_name) == -1) {					\
+		atf_tc_skip("module %s could not be resolved: %s",	\
+		    _mod_name, strerror(errno));			\
+	}								\
 } while(0)
 
-#define	PLAIN_REQUIRE_KERNEL_MODULE(_mod_name, _exit_code) do {	\
+#define	PLAIN_REQUIRE_KERNEL_MODULE(_mod_name, _exit_code) do {		\
 	if (modfind(_mod_name) == -1) {					\
-		err(_exit_code, "module %s could not be resolved",	\
-		    _mod_name);						\
+		printf("module %s could not be resolved: %s\n",		\
+		    _mod_name, strerror(errno));			\
+		_exit(_exit_code);					\
 	}								\
 } while(0)