Index: stable/10/tests/freebsd_test_suite/macros.h
===================================================================
--- stable/10/tests/freebsd_test_suite/macros.h	(revision 282858)
+++ stable/10/tests/freebsd_test_suite/macros.h	(revision 282859)
@@ -1,53 +1,56 @@
 /*-
  * Copyright (c) 2015 EMC / Isilon Storage Division
  * 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.
  *
  * $FreeBSD$
  */
 
 #ifndef	_FREEBSD_TEST_MACROS_H_
 #define	_FREEBSD_TEST_MACROS_H_
 
 #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)
 
 #endif
Index: stable/10
===================================================================
--- stable/10	(revision 282858)
+++ stable/10	(revision 282859)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r282211,282244