summaryrefslogtreecommitdiff
path: root/tests/kernel/kqueue
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2020-10-31 14:57:02 +0000
committerchristos <christos@NetBSD.org>2020-10-31 14:57:02 +0000
commitb149bf6aa763c0101078b22691c9d213ea444c0e (patch)
treec8ead57388f5f5f0c2900b388b73ffa9750fe493 /tests/kernel/kqueue
parentd218c9aac8cd3062b7af6c07928b210a32f7c1b1 (diff)
Avoid hard-coding names and limits so this will not break again.
Diffstat (limited to 'tests/kernel/kqueue')
-rw-r--r--tests/kernel/kqueue/t_ioctl.c25
1 files changed, 7 insertions, 18 deletions
diff --git a/tests/kernel/kqueue/t_ioctl.c b/tests/kernel/kqueue/t_ioctl.c
index f789175155f..d76912bc2ed 100644
--- a/tests/kernel/kqueue/t_ioctl.c
+++ b/tests/kernel/kqueue/t_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ioctl.c,v 1.4 2018/01/09 17:35:29 martin Exp $ */
+/* $NetBSD: t_ioctl.c,v 1.5 2020/10/31 14:57:02 christos Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -32,8 +32,9 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_ioctl.c,v 1.4 2018/01/09 17:35:29 martin Exp $");
+__RCSID("$NetBSD: t_ioctl.c,v 1.5 2020/10/31 14:57:02 christos Exp $");
+#define EVFILT_NAMES
#include <sys/event.h>
#include <sys/ioctl.h>
@@ -61,13 +62,13 @@ ATF_TC_BODY(kfilter_byfilter, tc)
km.name = buf;
km.len = sizeof(buf) - 1;
- for (i = 0; i < 8; ++i) {
+ for (i = 0; i < EVFILT_SYSCOUNT; ++i) {
km.filter = i;
RL(ioctl(kq, KFILTER_BYFILTER, &km));
(void)printf(" map %d -> %s\n", km.filter, km.name);
}
- km.filter = 8;
+ km.filter = EVFILT_SYSCOUNT;
ATF_REQUIRE_EQ(ioctl(kq, KFILTER_BYFILTER, &km), -1);
}
@@ -78,28 +79,16 @@ ATF_TC_HEAD(kfilter_byname, tc)
}
ATF_TC_BODY(kfilter_byname, tc)
{
- const char *tests[] = {
- "EVFILT_READ",
- "EVFILT_WRITE",
- "EVFILT_AIO",
- "EVFILT_VNODE",
- "EVFILT_PROC",
- "EVFILT_SIGNAL",
- "EVFILT_TIMER",
- "EVFILT_FS",
- NULL
- };
char buf[32];
struct kfilter_mapping km;
- const char **test;
int kq;
RL(kq = kqueue());
km.name = buf;
- for (test = &tests[0]; *test != NULL; ++test) {
- (void)strlcpy(buf, *test, sizeof(buf));
+ for (size_t i = 0; i < EVFILT_SYSCOUNT; i++) {
+ (void)strlcpy(buf, evfiltnames[i], sizeof(buf));
RL(ioctl(kq, KFILTER_BYNAME, &km));
(void)printf(" map %s -> %d\n", km.name, km.filter);
}