KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ATF_REQUIRE_KERNEL_MODULE: use atf_skip, not ATF_REQUIRE_MSG so the testcase

Browse Source 
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
This commit is contained in:
Enji Cooper
2015-04-29 08:56:56 +00:00
parent 1a8fd8faac
commit c82b9f9234
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/freebsd_test_suite/macros.h
+8 -5
View File
@@ -32,21 +32,24 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/module.h> #include <sys/module.h>
#include <string.h> #include <string.h>
#include <err.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <unistd.h>
#include <atf-c.h> #include <atf-c.h>
#define ATF_REQUIRE_KERNEL_MODULE(_mod_name) do { \ #define ATF_REQUIRE_KERNEL_MODULE(_mod_name) do { \
ATF_REQUIRE_MSG(modfind(_mod_name) != -1, \ if (modfind(_mod_name) == -1) { \
"module %s could not be resolved: %s", \ atf_skip("module %s could not be resolved: %s", \
_mod_name, strerror(errno)); \ _mod_name, strerror(errno)); \
} \
} while(0) } 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) { \ if (modfind(_mod_name) == -1) { \
err(_exit_code, "module %s could not be resolved", \ printf("module %s could not be resolved: %s\n", \
_mod_name); \ _mod_name, strerror(errno)); \
_exit(_exit_code); \
} \ } \
} while(0) } while(0)