d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r282211,r282244:

Browse Source 
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
This commit is contained in:
ngie 2015-05-13 12:13:18 +00:00
parent 3a757c0c1f
commit 8557666627
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/freebsd_test_suite/macros.h
View File

@ -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)