svn commit: r281427 - in user/ngie/more-tests: etc/mtree tests/sys tests/sys/kqueue tools/regression/kqueue

[Garrett Cooper]

Author: ngie
Date: Sat Apr 11 09:15:33 2015
New Revision: 281427
URL: https://svnweb.freebsd.org/changeset/base/281427

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

Added:
  user/ngie/more-tests/tests/sys/kqueue/
     - copied from r281415, user/ngie/more-tests/tools/regression/kqueue/
  user/ngie/more-tests/tests/sys/kqueue/kqueue_test.sh   (contents, props changed)
Deleted:
  user/ngie/more-tests/tools/regression/kqueue/
Modified:
  user/ngie/more-tests/etc/mtree/BSD.tests.dist
  user/ngie/more-tests/tests/sys/Makefile
  user/ngie/more-tests/tests/sys/kqueue/Makefile

Modified: user/ngie/more-tests/etc/mtree/BSD.tests.dist
==============================================================================
--- user/ngie/more-tests/etc/mtree/BSD.tests.dist	Sat Apr 11 09:05:42 2015	(r281426)
+++ user/ngie/more-tests/etc/mtree/BSD.tests.dist	Sat Apr 11 09:15:33 2015	(r281427)
@@ -356,6 +356,8 @@
     sys
         kern
         ..
+        kqueue
+        ..
         netinet
         ..
         opencrypto

Modified: user/ngie/more-tests/tests/sys/Makefile
==============================================================================
--- user/ngie/more-tests/tests/sys/Makefile	Sat Apr 11 09:05:42 2015	(r281426)
+++ user/ngie/more-tests/tests/sys/Makefile	Sat Apr 11 09:15:33 2015	(r281427)
@@ -5,6 +5,7 @@
 TESTSDIR= ${TESTSBASE}/sys
 
 TESTS_SUBDIRS+=		kern
+TESTS_SUBDIRS+=		kqueue
 TESTS_SUBDIRS+=		netinet
 TESTS_SUBDIRS+=		opencrypto
 TESTS_SUBDIRS+=		sockets

Modified: user/ngie/more-tests/tests/sys/kqueue/Makefile
==============================================================================
--- user/ngie/more-tests/tools/regression/kqueue/Makefile	Sat Apr 11 08:27:38 2015	(r281415)
+++ user/ngie/more-tests/tests/sys/kqueue/Makefile	Sat Apr 11 09:15:33 2015	(r281427)
@@ -6,8 +6,14 @@
 # libkqueue and test suite by Mark Heily <mark at 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>

Added: user/ngie/more-tests/tests/sys/kqueue/kqueue_test.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/ngie/more-tests/tests/sys/kqueue/kqueue_test.sh	Sat Apr 11 09:15:33 2015	(r281427)
@@ -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