svn commit: r282859 - stable/10/tests/freebsd_test_suite

[Garrett Cooper]

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)