Page MenuHomeFreeBSD
Files F153182536

D6172.id.diff
No OneTemporary
Actions

D6172.id.diff
View Options

Index: head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
===================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
+++ head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
@@ -34,6 +34,9 @@
The NetBSD Foundation, inc. All rights reserved.");
__RCSID("$NetBSD: t_proc2.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
#include <sys/event.h>
#include <sys/time.h>
#include <sys/types.h>
Index: head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
===================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
+++ head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
@@ -32,6 +32,9 @@
#include <sys/cdefs.h>
__RCSID("$NetBSD: t_proc3.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
#include <sys/event.h>
#include <sys/time.h>
#include <sys/types.h>
Index: head/contrib/netbsd-tests/kernel/kqueue/t_sig.c
===================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/t_sig.c
+++ head/contrib/netbsd-tests/kernel/kqueue/t_sig.c
@@ -34,6 +34,9 @@
The NetBSD Foundation, inc. All rights reserved.");
__RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $");
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
#include <sys/event.h>
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -60,9 +63,13 @@
ATF_TC_BODY(sig, tc)
{
struct timespec timeout;
+#ifdef __NetBSD__
struct kfilter_mapping km;
+#endif
struct kevent event[1];
+#ifdef __NetBSD__
char namebuf[32];
+#endif
pid_t pid, child;
int kq, n, num, status;
@@ -84,16 +91,22 @@
RL(kq = kqueue());
+#ifdef __NetBSD__
(void)strlcpy(namebuf, "EVFILT_SIGNAL", sizeof(namebuf));
km.name = namebuf;
RL(ioctl(kq, KFILTER_BYNAME, &km));
(void)printf("got %d as filter number for `%s'.\n", km.filter, km.name);
+#endif
/* ignore the signal to avoid taking it for real */
REQUIRE_LIBC(signal(SIGUSR1, SIG_IGN), SIG_ERR);
event[0].ident = SIGUSR1;
+#ifdef __NetBSD__
event[0].filter = km.filter;
+#else
+ event[0].filter = EVFILT_SIGNAL;
+#endif
event[0].flags = EV_ADD | EV_ENABLE;
RL(kevent(kq, event, 1, NULL, 0, NULL));
Index: head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
===================================================================
--- head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
+++ head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
@@ -1,3 +1,6 @@
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
#include <sys/event.h>
#include <sys/stat.h>
#include <sys/time.h>
Index: head/tests/sys/kqueue/Makefile
===================================================================
--- head/tests/sys/kqueue/Makefile
+++ head/tests/sys/kqueue/Makefile
@@ -1,8 +1,20 @@
# $FreeBSD$
+TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel/kqueue
+
TESTSDIR= ${TESTSBASE}/sys/kqueue
BINDIR= ${TESTSDIR}
+NETBSD_ATF_TESTS_C= proc1_test
+# XXX: fails `ke.fflags & NOTE_TRACKERR` invariant
+#NETBSD_ATF_TESTS_C+= proc2_test
+NETBSD_ATF_TESTS_C+= proc3_test
+NETBSD_ATF_TESTS_C+= sig_test
+NETBSD_ATF_TESTS_C+= vnode_test
+
+WARNS?= 3
+
TESTS_SUBDIRS+= libkqueue
+.include <netbsd-tests.test.mk>
.include <bsd.test.mk>

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 20, 4:06 PM (8 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31849837
Default Alt Text
D6172.id.diff (3 KB)

Event Timeline