From nobody Wed May 25 00:18:20 2022 X-Original-To: dev-commits-src-all@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 1894F1B3BCE8; Wed, 25 May 2022 00:18:22 +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 4L7BVj3lJbz3mhx; Wed, 25 May 2022 00:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653437901; 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=QjIvlf0on3E3qP2r1RdtgvbueaJloRmiwOK9LpnPU8s=; b=KziIljWtVF6YARwfIFpjxWlwR1T3UMScVhLTQ9fp8xiUIiMukqDxDuq/Gok1IPII58NaC5 VugiIIwPToINppMpJDMXDsN6CvZW8+SGAeiqtdFfJohNM/08s1YrJq4JOLHpYHTsUEPwu5 60ZzvQgEYFkxhlVUkQabCsVZQmUYIsXFwMhlp0d9nEEGpawOPkghgSdbffPdbnNyYFNgth 8WIMSbCMEbRlzqHUT62dJMyNSbmzksYx6zyCov9+jXu+uUJNO72T3qxy3aLebQEyfowIu6 uJXGJsQDPCMdGXNHrLLD81PIeNcDlH+WqdeZ2RHb0rAkxXj1VrzJXhdXVNI5pw== 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 BD93466B0; Wed, 25 May 2022 00:18:20 +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 24P0IKdS006117; Wed, 25 May 2022 00:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24P0IKjh006116; Wed, 25 May 2022 00:18:20 GMT (envelope-from git) Date: Wed, 25 May 2022 00:18:20 GMT Message-Id: <202205250018.24P0IKjh006116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 68fe988a40ca - main - kqueue tests: Simplify the test runner List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 68fe988a40ca5dedec426735f52471d9af7bddbd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653437901; 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=QjIvlf0on3E3qP2r1RdtgvbueaJloRmiwOK9LpnPU8s=; b=Sx5jvYK6UrJJF79h5YA+xruVx0OCutbhTbTlQ1pqUowgpAA35qHp0D1kcbhbVDYqoh7x0A BUtFiyjCd69pmyIgYU8Vtc3d968jChEbgC+nEuxu+EAtMqXkkYK5+DR7PSJoppYIQA1Tgw UPuHiKWukX4YFeHbd15oW+PcetMsHgy/mS/nSJqTdAcHsRGUw7E2huL5mJE+oYvyLuFzig /M1oa8LEE5Fu/bOrywc1ZvRpcu2RVmAYNJ1lj2aaOHV4P8dpvD9j2TU4cHgzOlpkx7ksLC qZquG+8tsPRyDSLHIRZOXcaIZeoBMu4relsO5XdRpT36EEvo9oXCZyAQkG2cpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653437901; a=rsa-sha256; cv=none; b=GNMiCM3EW+JrmvMezBWR6P4YOVdh11F6jZx74NL6JlokCi5d7VjGDhnxMyfQTv4YuSpbuM MuW+qwfc8XEJHdb9gY7xGisNAS7QFyxgpj2Rifq5LKP/LDciN8v9jVq0WSgEcp9ggHGAuk k+CWbIZBfZlj3WLCE1JPmDh584CxWBZyAb72pJ4fS3cTsHSe2tuo2ZWLqAspuKPv3nKoBu 1NgoGiFLQGx1paZR5mYJJ/1LwTnCkYCgI2nBKfur+jsvLZv3vOeAukGSWmKFitBDIsMoyC jmdIhKB1gIL20otRBAcuDRK00ok/uUp9sgJHAiQKTYGVZgWX7p4IGFiwsClNog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68fe988a40ca5dedec426735f52471d9af7bddbd commit 68fe988a40ca5dedec426735f52471d9af7bddbd Author: Mark Johnston AuthorDate: 2022-05-25 00:17:04 +0000 Commit: Mark Johnston CommitDate: 2022-05-25 00:17:41 +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. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- 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 64ca3faee70f..7f2ead926b6e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -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 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