From 231f1f1a9dc3527143b26541f5937bc27396b5b4 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 13 May 2015 10:21:13 +0000
Subject: [PATCH] MFC r282063:

Integrate tools/regression/kqueue into the FreeBSD test suite as
tests/sys/kqueue


git-svn-id: svn://svn.freebsd.org/base/stable/10@282841 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/mtree/BSD.tests.dist                        |  2 ++
 tests/sys/Makefile                              |  1 +
 {tools/regression => tests/sys}/kqueue/Makefile | 13 +++++++++----
 {tools/regression => tests/sys}/kqueue/common.h |  0
 {tools/regression => tests/sys}/kqueue/config.h |  0
 tests/sys/kqueue/kqueue_test.sh                 | 17 +++++++++++++++++
 {tools/regression => tests/sys}/kqueue/main.c   |  0
 {tools/regression => tests/sys}/kqueue/proc.c   |  0
 {tools/regression => tests/sys}/kqueue/read.c   |  0
 {tools/regression => tests/sys}/kqueue/signal.c |  0
 {tools/regression => tests/sys}/kqueue/timer.c  |  0
 {tools/regression => tests/sys}/kqueue/user.c   |  0
 {tools/regression => tests/sys}/kqueue/vnode.c  |  0
 13 files changed, 29 insertions(+), 4 deletions(-)
 rename {tools/regression => tests/sys}/kqueue/Makefile (62%)
 rename {tools/regression => tests/sys}/kqueue/common.h (100%)
 rename {tools/regression => tests/sys}/kqueue/config.h (100%)
 create mode 100755 tests/sys/kqueue/kqueue_test.sh
 rename {tools/regression => tests/sys}/kqueue/main.c (100%)
 rename {tools/regression => tests/sys}/kqueue/proc.c (100%)
 rename {tools/regression => tests/sys}/kqueue/read.c (100%)
 rename {tools/regression => tests/sys}/kqueue/signal.c (100%)
 rename {tools/regression => tests/sys}/kqueue/timer.c (100%)
 rename {tools/regression => tests/sys}/kqueue/user.c (100%)
 rename {tools/regression => tests/sys}/kqueue/vnode.c (100%)

diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index a9e28bcb4..699dd45d7 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -180,6 +180,8 @@
     sys
         kern
         ..
+        kqueue
+        ..
         netinet
         ..
         pjdfstest
diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index fbfe367d5..4eb9a5ebe 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -5,6 +5,7 @@
 TESTSDIR= ${TESTSBASE}/sys
 
 TESTS_SUBDIRS+=		kern
+TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		netinet
 
 # Items not integrated into kyua runs by default
diff --git a/tools/regression/kqueue/Makefile b/tests/sys/kqueue/Makefile
similarity index 62%
rename from tools/regression/kqueue/Makefile
rename to tests/sys/kqueue/Makefile
index 12b752752..43277ca0c 100644
--- a/tools/regression/kqueue/Makefile
+++ b/tests/sys/kqueue/Makefile
@@ -6,8 +6,14 @@
 # libkqueue and test suite by Mark Heily <mark@heily.com>
 #
 
-PROG=kqtest
-SRCS=			\
+TAP_TESTS_SH=	kqueue_test
+
+TESTSDIR=	${TESTSBASE}/sys/kqueue
+BINDIR=		${TESTSDIR}
+
+PROGS=	kqtest
+
+SRCS.kqtest=		\
 	main.c		\
 	read.c		\
 	timer.c		\
@@ -15,7 +21,6 @@ SRCS=			\
 	proc.c		\
 	signal.c	\
 	user.c
-MAN=
 WARNS?=	2
 
-.include "bsd.prog.mk"
+.include <bsd.test.mk>
diff --git a/tools/regression/kqueue/common.h b/tests/sys/kqueue/common.h
similarity index 100%
rename from tools/regression/kqueue/common.h
rename to tests/sys/kqueue/common.h
diff --git a/tools/regression/kqueue/config.h b/tests/sys/kqueue/config.h
similarity index 100%
rename from tools/regression/kqueue/config.h
rename to tests/sys/kqueue/config.h
diff --git a/tests/sys/kqueue/kqueue_test.sh b/tests/sys/kqueue/kqueue_test.sh
new file mode 100755
index 000000000..62a7e2305
--- /dev/null
+++ b/tests/sys/kqueue/kqueue_test.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd $(dirname $0)
+i=1
+./kqtest | while read line; do
+	echo $line | grep -q passed
+	if [ $? -eq 0 ]; then
+		echo "ok - $i $line"
+		: $(( i += 1 ))
+	fi
+
+	echo $line | grep -q 'tests completed'
+	if [ $? -eq 0 ]; then
+		echo -n "1.."
+		echo $line | cut -d' ' -f3
+	fi
+done
diff --git a/tools/regression/kqueue/main.c b/tests/sys/kqueue/main.c
similarity index 100%
rename from tools/regression/kqueue/main.c
rename to tests/sys/kqueue/main.c
diff --git a/tools/regression/kqueue/proc.c b/tests/sys/kqueue/proc.c
similarity index 100%
rename from tools/regression/kqueue/proc.c
rename to tests/sys/kqueue/proc.c
diff --git a/tools/regression/kqueue/read.c b/tests/sys/kqueue/read.c
similarity index 100%
rename from tools/regression/kqueue/read.c
rename to tests/sys/kqueue/read.c
diff --git a/tools/regression/kqueue/signal.c b/tests/sys/kqueue/signal.c
similarity index 100%
rename from tools/regression/kqueue/signal.c
rename to tests/sys/kqueue/signal.c
diff --git a/tools/regression/kqueue/timer.c b/tests/sys/kqueue/timer.c
similarity index 100%
rename from tools/regression/kqueue/timer.c
rename to tests/sys/kqueue/timer.c
diff --git a/tools/regression/kqueue/user.c b/tests/sys/kqueue/user.c
similarity index 100%
rename from tools/regression/kqueue/user.c
rename to tests/sys/kqueue/user.c
diff --git a/tools/regression/kqueue/vnode.c b/tests/sys/kqueue/vnode.c
similarity index 100%
rename from tools/regression/kqueue/vnode.c
rename to tests/sys/kqueue/vnode.c
-- 
2.45.0