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

Use ATF_REQUIRE_KERNEL_MODULE instead of aio_available function

Browse Source 
MFC after: 6 days
This commit is contained in:
Enji Cooper 2015-04-28 10:51:12 +00:00
parent b740c88bfb
commit c5dfa43a6c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=282135
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/sys/aio/aio_test.c
View File

@ -59,6 +59,8 @@
#include <atf-c.h> #include <atf-c.h>
#include "freebsd_test_suite/macros.h"
#define PATH_TEMPLATE "aio.XXXXXXXXXX" #define PATH_TEMPLATE "aio.XXXXXXXXXX"
/* /*
@ -82,15 +84,6 @@ struct aio_context {
static int aio_timedout; static int aio_timedout;
static void
aio_available(void)
{
if (modfind("aio") == -1)
atf_tc_skip("aio support not available in the kernel; "
"skipping testcases");
}
/* /*
* Each test run specifies a timeout in seconds. Use the somewhat obsoleted * Each test run specifies a timeout in seconds. Use the somewhat obsoleted
* signal(3) and alarm(3) APIs to set this up. * signal(3) and alarm(3) APIs to set this up.
@ -211,7 +204,7 @@ aio_write_test(struct aio_context *ac)
struct aiocb aio, *aiop; struct aiocb aio, *aiop;
ssize_t len; ssize_t len;
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
bzero(&aio, sizeof(aio)); bzero(&aio, sizeof(aio));
aio.aio_buf = ac->ac_buffer; aio.aio_buf = ac->ac_buffer;
@ -263,7 +256,7 @@ aio_read_test(struct aio_context *ac)
struct aiocb aio, *aiop; struct aiocb aio, *aiop;
ssize_t len; ssize_t len;
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
bzero(ac->ac_buffer, ac->ac_buflen); bzero(ac->ac_buffer, ac->ac_buflen);
bzero(&aio, sizeof(aio)); bzero(&aio, sizeof(aio));
@ -346,7 +339,7 @@ ATF_TC_BODY(aio_file_test, tc)
struct aio_context ac; struct aio_context ac;
int fd; int fd;
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
strcpy(pathname, PATH_TEMPLATE); strcpy(pathname, PATH_TEMPLATE);
fd = mkstemp(pathname); fd = mkstemp(pathname);
@ -392,7 +385,7 @@ ATF_TC_BODY(aio_fifo_test, tc)
char pathname[PATH_MAX]; char pathname[PATH_MAX];
struct aio_context ac; struct aio_context ac;
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
/* /*
* In theory, mkstemp() can return a name that is then collided with. * In theory, mkstemp() can return a name that is then collided with.
@ -461,7 +454,7 @@ ATF_TC_BODY(aio_unix_socketpair_test, tc)
struct aio_context ac; struct aio_context ac;
int sockets[2]; int sockets[2];
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
ATF_REQUIRE_MSG(socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) != -1, ATF_REQUIRE_MSG(socketpair(PF_UNIX, SOCK_STREAM, 0, sockets) != -1,
"socketpair failed: %s", strerror(errno)); "socketpair failed: %s", strerror(errno));
@ -503,7 +496,7 @@ ATF_TC_BODY(aio_pty_test, tc)
struct termios ts; struct termios ts;
int error; int error;
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
ATF_REQUIRE_MSG(openpty(&read_fd, &write_fd, NULL, NULL, NULL) == 0, ATF_REQUIRE_MSG(openpty(&read_fd, &write_fd, NULL, NULL, NULL) == 0,
"openpty failed: %s", strerror(errno)); "openpty failed: %s", strerror(errno));
@ -550,7 +543,7 @@ ATF_TC_BODY(aio_pipe_test, tc)
struct aio_context ac; struct aio_context ac;
int pipes[2]; int pipes[2];
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
ATF_REQUIRE_MSG(pipe(pipes) != -1, ATF_REQUIRE_MSG(pipe(pipes) != -1,
"pipe failed: %s", strerror(errno)); "pipe failed: %s", strerror(errno));
@ -613,7 +606,7 @@ ATF_TC_BODY(aio_md_test, tc)
struct aio_context ac; struct aio_context ac;
struct md_ioctl mdio; struct md_ioctl mdio;
aio_available(); ATF_REQUIRE_KERNEL_MODULE("aio");
mdctl_fd = open("/dev/" MDCTL_NAME, O_RDWR, 0); mdctl_fd = open("/dev/" MDCTL_NAME, O_RDWR, 0);
ATF_REQUIRE_MSG(mdctl_fd != -1, ATF_REQUIRE_MSG(mdctl_fd != -1,