kqueue tests: Simplify the test runner

Just invoke the test program directly instead of trying to convert its
output to TAP format.  The test suite is all or nothing; there's no way
to enumerate individual test cases, so there's no advantage in trying to
massage its output, and doing so throws away information that's useful
when diagnosing test failures.

MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2022-05-24 20:17:04 -04:00
parent d6d4f9b45e
commit 68fe988a40
3 changed files with 4 additions and 21 deletions

View File

@ -52,6 +52,8 @@
# xargs -n1 | sort | uniq -d;
# done
# 20220524: libkqueue test updates
OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest
# 20220514: new clang import which bumps version from 13.0.0 to 14.0.3
OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/algorithm
OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/complex

View File

@ -4,11 +4,9 @@ TESTSDIR= ${TESTSBASE}/sys/kqueue/libkqueue
BINDIR= ${TESTSDIR}
# libkqueue and test suite by Mark Heily <mark@heily.com>
TAP_TESTS_SH= kqueue_test
PLAIN_TESTS_C= kqueue_test
PROGS= kqtest
SRCS.kqtest= \
SRCS.kqueue_test= \
main.c \
read.c \
timer.c \

View File

@ -1,17 +0,0 @@
#!/bin/sh
# $FreeBSD$
i=1
"$(dirname $0)/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