Author: ngie
Date: Fri Feb 10 02:29:39 2017
New Revision: 313508
URL: https://svnweb.freebsd.org/changeset/base/313508
Log:
MFC r305468:
Port contrib/netbsd-tests/kernel/kqueue/... as tests/sys/kqueue/...
proc2_test must be skipped because the invariant tested
(`ke.fflags & NOTE_TRACKERR`) doesn't pass.
Modified:
stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c
stable/10/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
stable/10/tests/sys/kqueue/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
==============================================================================
--- stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Fri Feb 10
02:29:09 2017 (r313507)
+++ stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Fri Feb 10
02:29:39 2017 (r313508)
@@ -34,6 +34,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
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>
Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
==============================================================================
--- stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Fri Feb 10
02:29:09 2017 (r313507)
+++ stable/10/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Fri Feb 10
02:29:39 2017 (r313508)
@@ -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>
Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c
==============================================================================
--- stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c Fri Feb 10
02:29:09 2017 (r313507)
+++ stable/10/contrib/netbsd-tests/kernel/kqueue/t_sig.c Fri Feb 10
02:29:39 2017 (r313508)
@@ -34,6 +34,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
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_HEAD(sig, tc)
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 @@ ATF_TC_BODY(sig, tc)
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));
Modified: stable/10/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
==============================================================================
--- stable/10/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Fri Feb 10
02:29:09 2017 (r313507)
+++ stable/10/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Fri Feb 10
02:29:39 2017 (r313508)
@@ -1,3 +1,6 @@
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
#include <sys/event.h>
#include <sys/stat.h>
#include <sys/time.h>
Modified: stable/10/tests/sys/kqueue/Makefile
==============================================================================
--- stable/10/tests/sys/kqueue/Makefile Fri Feb 10 02:29:09 2017
(r313507)
+++ stable/10/tests/sys/kqueue/Makefile Fri Feb 10 02:29:39 2017
(r313508)
@@ -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>
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
