diff options
author | ngie <ngie@FreeBSD.org> | 2015-05-13 10:21:13 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-05-13 10:21:13 +0000 |
commit | 559871946b1e0e49c7548d9e828172705cbb4f57 (patch) | |
tree | 6278f3f0380980af59fccdf5a824ff244bffd8fa | |
parent | cd74b53f5b9e40767469550eb68252ba841f9c76 (diff) | |
download | FreeBSD-src-559871946b1e0e49c7548d9e828172705cbb4f57.zip FreeBSD-src-559871946b1e0e49c7548d9e828172705cbb4f57.tar.gz |
MFC r282063:
Integrate tools/regression/kqueue into the FreeBSD test suite as
tests/sys/kqueue
-rw-r--r-- | etc/mtree/BSD.tests.dist | 2 | ||||
-rw-r--r-- | tests/sys/Makefile | 1 | ||||
-rw-r--r-- | tests/sys/kqueue/Makefile (renamed from tools/regression/kqueue/Makefile) | 13 | ||||
-rw-r--r-- | tests/sys/kqueue/common.h (renamed from tools/regression/kqueue/common.h) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/config.h (renamed from tools/regression/kqueue/config.h) | 0 | ||||
-rwxr-xr-x | tests/sys/kqueue/kqueue_test.sh | 17 | ||||
-rw-r--r-- | tests/sys/kqueue/main.c (renamed from tools/regression/kqueue/main.c) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/proc.c (renamed from tools/regression/kqueue/proc.c) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/read.c (renamed from tools/regression/kqueue/read.c) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/signal.c (renamed from tools/regression/kqueue/signal.c) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/timer.c (renamed from tools/regression/kqueue/timer.c) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/user.c (renamed from tools/regression/kqueue/user.c) | 0 | ||||
-rw-r--r-- | tests/sys/kqueue/vnode.c (renamed from tools/regression/kqueue/vnode.c) | 0 |
13 files changed, 29 insertions, 4 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index a9e28bc..699dd45 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 fbfe367..4eb9a5e 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 index 12b7527..43277ca 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 index aada778..aada778 100644 --- a/tools/regression/kqueue/common.h +++ b/tests/sys/kqueue/common.h diff --git a/tools/regression/kqueue/config.h b/tests/sys/kqueue/config.h index a204092..a204092 100644 --- a/tools/regression/kqueue/config.h +++ b/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 0000000..62a7e23 --- /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 index f76c4e2..f76c4e2 100644 --- a/tools/regression/kqueue/main.c +++ b/tests/sys/kqueue/main.c diff --git a/tools/regression/kqueue/proc.c b/tests/sys/kqueue/proc.c index 6288ee6..6288ee6 100644 --- a/tools/regression/kqueue/proc.c +++ b/tests/sys/kqueue/proc.c diff --git a/tools/regression/kqueue/read.c b/tests/sys/kqueue/read.c index cc65427..cc65427 100644 --- a/tools/regression/kqueue/read.c +++ b/tests/sys/kqueue/read.c diff --git a/tools/regression/kqueue/signal.c b/tests/sys/kqueue/signal.c index 14e751d..14e751d 100644 --- a/tools/regression/kqueue/signal.c +++ b/tests/sys/kqueue/signal.c diff --git a/tools/regression/kqueue/timer.c b/tests/sys/kqueue/timer.c index 766125d..766125d 100644 --- a/tools/regression/kqueue/timer.c +++ b/tests/sys/kqueue/timer.c diff --git a/tools/regression/kqueue/user.c b/tests/sys/kqueue/user.c index 9ba25f9..9ba25f9 100644 --- a/tools/regression/kqueue/user.c +++ b/tests/sys/kqueue/user.c diff --git a/tools/regression/kqueue/vnode.c b/tests/sys/kqueue/vnode.c index dfa0b5e..dfa0b5e 100644 --- a/tools/regression/kqueue/vnode.c +++ b/tests/sys/kqueue/vnode.c |