aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2015-04-29 08:56:56 +0000
committerEnji Cooper <ngie@FreeBSD.org>2015-04-29 08:56:56 +0000
commitc82b9f923426d26f1cbf9541ac5f54c78d1a6aa6 (patch)
tree142644d3b43dda0372c3f9df9e520fa4e5fea273
parent1a8fd8faac6f91e68a9c64c5e37e1b64cc7a34db (diff)
downloadsrc-c82b9f923426d26f1cbf9541ac5f54c78d1a6aa6.tar.gz
src-c82b9f923426d26f1cbf9541ac5f54c78d1a6aa6.zip
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 MFC after: 5 days
Notes
Notes: svn path=/head/; revision=282211
-rw-r--r--tests/freebsd_test_suite/macros.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/freebsd_test_suite/macros.h b/tests/freebsd_test_suite/macros.h
index 755a9942d5f5..bc0b61027634 100644
--- a/tests/freebsd_test_suite/macros.h
+++ b/tests/freebsd_test_suite/macros.h
@@ -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_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)