From owner-svn-src-all@freebsd.org Tue Sep 6 08:50:22 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 97D74B96301; Tue, 6 Sep 2016 08:50:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 734C89E9; Tue, 6 Sep 2016 08:50:22 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u868oLOg043647; Tue, 6 Sep 2016 08:50:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u868oLD8043642; Tue, 6 Sep 2016 08:50:21 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201609060850.u868oLD8043642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Tue, 6 Sep 2016 08:50:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r305468 - in head: contrib/netbsd-tests/kernel/kqueue tests/sys/kqueue X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Sep 2016 08:50:22 -0000 Author: ngie Date: Tue Sep 6 08:50:21 2016 New Revision: 305468 URL: https://svnweb.freebsd.org/changeset/base/305468 Log: 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. MFC after: 58 days Submitted by: kib (earlier form) Sponsored by: EMC / Isilon Storage Division Differential Revision: https://reviews.freebsd.org/D6172 Modified: head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c head/contrib/netbsd-tests/kernel/kqueue/t_sig.c head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c head/tests/sys/kqueue/Makefile Modified: head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c ============================================================================== --- head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Tue Sep 6 08:45:29 2016 (r305467) +++ head/contrib/netbsd-tests/kernel/kqueue/t_proc2.c Tue Sep 6 08:50:21 2016 (r305468) @@ -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 +#endif #include #include #include Modified: head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c ============================================================================== --- head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Tue Sep 6 08:45:29 2016 (r305467) +++ head/contrib/netbsd-tests/kernel/kqueue/t_proc3.c Tue Sep 6 08:50:21 2016 (r305468) @@ -32,6 +32,9 @@ #include __RCSID("$NetBSD: t_proc3.c,v 1.2 2015/01/14 22:22:32 christos Exp $"); +#ifdef __FreeBSD__ +#include +#endif #include #include #include Modified: head/contrib/netbsd-tests/kernel/kqueue/t_sig.c ============================================================================== --- head/contrib/netbsd-tests/kernel/kqueue/t_sig.c Tue Sep 6 08:45:29 2016 (r305467) +++ head/contrib/netbsd-tests/kernel/kqueue/t_sig.c Tue Sep 6 08:50:21 2016 (r305468) @@ -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 +#endif #include #include #include @@ -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: head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c ============================================================================== --- head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Tue Sep 6 08:45:29 2016 (r305467) +++ head/contrib/netbsd-tests/kernel/kqueue/t_vnode.c Tue Sep 6 08:50:21 2016 (r305468) @@ -1,3 +1,6 @@ +#ifdef __FreeBSD__ +#include +#endif #include #include #include Modified: head/tests/sys/kqueue/Makefile ============================================================================== --- head/tests/sys/kqueue/Makefile Tue Sep 6 08:45:29 2016 (r305467) +++ head/tests/sys/kqueue/Makefile Tue Sep 6 08:50:21 2016 (r305468) @@ -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 .include