From nobody Wed Jun 8 00:45:01 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3F8D884288A; Wed, 8 Jun 2022 00:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LHpR15sDJz4nw8; Wed, 8 Jun 2022 00:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654649101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0fwWujJgOnp8Bbf6zDpiuVVhaqQPONew1CCSzcX6Eg=; b=Ds+F2QUHV7r+SX7yHVpX8t+b3nYduBuDkj2lpmGg55F+xwz17cCNn2bDw/lzYNah5tG3JD EnKQdQWlnD35LlXngn9Cv2n/u/xVv6djiQJch6K/uBI6o5iAmAh9+/Fbd8EbObycEkJA+0 jBblNIsQZyzaWFUf/uJvmA44nViViBvvTZ4xe0vNb7HfFreAYhz/T62VZaVPWEELxd1jbU 4EQNnEKL4S1i40zNVVAMRswUhQZMY2nXgnfkxMclD25sPMvYuK2VQdXzQw8R7tt40IADLi hsYAZRtUcZ/VbmHJ6XUYuk6eX+STzGHYQD/RNzHiuo4otjLnbOvD7hinI4WHcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DE1C2579C; Wed, 8 Jun 2022 00:45:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2580j1CY060715; Wed, 8 Jun 2022 00:45:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2580j1x5060714; Wed, 8 Jun 2022 00:45:01 GMT (envelope-from git) Date: Wed, 8 Jun 2022 00:45:01 GMT Message-Id: <202206080045.2580j1x5060714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 294386e0f7c0 - stable/13 - kqueue tests: Simplify the test runner List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 294386e0f7c008a6717801e90488e23e7e85337e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654649101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U0fwWujJgOnp8Bbf6zDpiuVVhaqQPONew1CCSzcX6Eg=; b=w5TxY3UgoyPZsVf1yXtEgJ+uaKo/cIheEMFM3Y9a4mMWR31bZ9No8cCEg0hRyIUAON95Ei T5XH/C5FFQqjwTXYB2jdjwl9zStfqovWcx5PS7my8ZRQL2+Eg0Lz7OTQ/DZgXt2awXpp6/ /yzzS+sNW8Kzm4h9lCgc0t7S2ZgYlzB1x1LJLRzQut4HxWM4Zp3apO6aSwQp/BBuXYJ3EH lWvJlFut4w4NUc9JxsAfRo92TEeWWRwWSHFYaPGHSjWavE3Xiw/5iH1DgaRuC4AQwh1+vo 9sHaOeu3qZlkU0TJeKQaBPtUUT/JLUY9iSQuFaLvhaLBY6hGKyj9ngdJrGDF9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654649101; a=rsa-sha256; cv=none; b=Ff/DV+Blwppfm62bx4ttt5jH/g8gxYm6ojMTj080u08djHBZeX4RiHf6z/O63QazOpdroP bEz4j65qsDUSlf+mzM2YhRWDHBv9tXKhpM7asQi5/dZm3awdPVfVCL92g230iPzzxLc38I 88+pN61LoWX9GIwtn1rSWUxcq4c5Ep5ZQgSGvM+3g8NI6jnZhv6eYw+gfgMESKgAaCA0o7 1VtbiHkQOQzq8JloiEkFoh3IEuyg9MTmz8fMLA4DjQRon1ULUgU/fn1SSFQq5e+3YAZHYy eNeMxLwILsG/162+CAQMmR8A2Ygd6eFmlQRWtm7E5lIaWwuj4fIOX+94kiuRJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=294386e0f7c008a6717801e90488e23e7e85337e commit 294386e0f7c008a6717801e90488e23e7e85337e Author: Mark Johnston AuthorDate: 2022-05-25 00:17:04 +0000 Commit: Mark Johnston CommitDate: 2022-06-08 00:42:28 +0000 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. Sponsored by: The FreeBSD Foundation (cherry picked from commit 68fe988a40ca5dedec426735f52471d9af7bddbd) --- ObsoleteFiles.inc | 2 ++ tests/sys/kqueue/libkqueue/Makefile | 6 ++---- tests/sys/kqueue/libkqueue/kqueue_test.sh | 17 ----------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4b4b4bb96a65..d4f7d44b27b4 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,8 @@ # xargs -n1 | sort | uniq -d; # done +# 20220607: libkqueue test updates +OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest # 20220604: 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 diff --git a/tests/sys/kqueue/libkqueue/Makefile b/tests/sys/kqueue/libkqueue/Makefile index cc29e35aa510..869b71209c4d 100644 --- a/tests/sys/kqueue/libkqueue/Makefile +++ b/tests/sys/kqueue/libkqueue/Makefile @@ -4,11 +4,9 @@ TESTSDIR= ${TESTSBASE}/sys/kqueue/libkqueue BINDIR= ${TESTSDIR} # libkqueue and test suite by Mark Heily -TAP_TESTS_SH= kqueue_test +PLAIN_TESTS_C= kqueue_test -PROGS= kqtest - -SRCS.kqtest= \ +SRCS.kqueue_test= \ main.c \ read.c \ timer.c \ diff --git a/tests/sys/kqueue/libkqueue/kqueue_test.sh b/tests/sys/kqueue/libkqueue/kqueue_test.sh deleted file mode 100644 index 3185d826c7dd..000000000000 --- a/tests/sys/kqueue/libkqueue/kqueue_test.sh +++ /dev/null @@ -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