From owner-svn-src-user@FreeBSD.ORG Sat Apr 11 09:15:35 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ADFFE7CD; Sat, 11 Apr 2015 09:15:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 80947840; Sat, 11 Apr 2015 09:15:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3B9FZT2096566; Sat, 11 Apr 2015 09:15:35 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3B9FYgU096559; Sat, 11 Apr 2015 09:15:34 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201504110915.t3B9FYgU096559@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sat, 11 Apr 2015 09:15:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281427 - in user/ngie/more-tests: etc/mtree tests/sys tests/sys/kqueue tools/regression/kqueue X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2015 09:15:35 -0000 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 # -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 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