From nobody Tue Feb 17 23:57:57 2026 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 4fFxR93WMhz6SK26 for ; Tue, 17 Feb 2026 23:57:57 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFxR92bFxz4Q85 for ; Tue, 17 Feb 2026 23:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372677; 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=upVKnb6gMWen9kZ91nAj8Apn9tFBjLSyLMFlz7vvrHU=; b=Dq4EnxEPjFHU4DMxVIygS0lpeEeQRXHN0ic5ghCqmXr3OP9YkwUshV2M2Unpbc1XGoSsZS Zh7CDxawc33cTnl8NYljRyRTXQbFdTZI6xhBoRj+dlfQOZ3X0JLTq7tXzA7sxhpAA6Cuqq hRsegEDX7wgaS1ywtWc9F8Fc0oQRtCoGIY1bXH++qr0ARPazfU2Xo1ZF1dXEOyjHWCvoQw crNUkeCLLKP4cg8ek+wAggGWg9SAWlNz1f76qwTdJcy5JcqjkwS1Squ1ATOKtIRJ2nXN+d sX+iinuooXfcmceATLiGL+UIdSrd8hV205f63PPtbHg6WXG7dn6YKJOIJLyFBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771372677; a=rsa-sha256; cv=none; b=ZgRBX9slp4CVhdLfI27FRYyDjvXiFVJFVTDsrZ1U+yZvuhoYR21ss7NBuMD1eK22sGp1Em 4W51Nz1MFuilstHzRmHWcMQV30LndB94r00rvQChSsZSzdIQ4QbTHr4s8GKQL29/88eFw/ Du8kk7nWTz5vNg9eQcchwVGtnpQMp46BS5il1VHD52vzBn5WNP2Ozm3Ldz0y1/w4PS56B1 KD+v9TPIbYD0OSU86NMKdwVZd1OxIN1lObTMg1mw0tymj2W3ISvTeW4Bm8epUhjpjEuZfn OUjxDvBs55NbHGDUAozwYo/tYg4HxpDFAoyUc3lND0w1I0t4mB5H9Er8A7c2Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771372677; 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=upVKnb6gMWen9kZ91nAj8Apn9tFBjLSyLMFlz7vvrHU=; b=SFoY2qg/6WecZ3kdfzG9SWn/lsMGNzQIMo6oVswEh3lN4+pkb0AuiOR8jXO03d7LYMhvnR QP/vIGyQgsFxyeou3kLxQw0CLOJ1RmwuM94hzAuWkqS1OJznRekPHwmSZm9Swayds0gDkz VaZ6X+671RqBGf4l9GQLeZSxaG+8tOWrBiL/gffVZAtWk30zbTu6gonSlKD62BrSp3fB3a V5+ShsUk8xtX5PGkluDtWgew66OJUAWJ71NpQg43+CNUjBl5v2I7p1lwsOFEIb0Hw5kmj8 eNQNLfumY2M03/JVvPahwtM/D12MXH9UuSEgbfnd/LPkYWjVTTmHmazQPDYOKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFxR91ncSzXPp for ; Tue, 17 Feb 2026 23:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b52c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 23:57:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 05f0dcd80d6a - stable/15 - tests: Simplify libarchive tests 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 05f0dcd80d6a5203c061825ba8435a4732754930 Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 23:57:57 +0000 Message-Id: <69950085.3b52c.1ec45335@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=05f0dcd80d6a5203c061825ba8435a4732754930 commit 05f0dcd80d6a5203c061825ba8435a4732754930 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-06 13:48:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-17 23:11:48 +0000 tests: Simplify libarchive tests The ATF tests work by first running the test program with an invalid flag, which causes it to print an error message, a summary of options, and a list of available test cases. Switch to the new -l option which simply prints the list, and simplify the awk script used to parse the output. No functional change. MFC after: 1 week (cherry picked from commit 394201ce5b4e2f84f1e39a7ce8bdc3f5a5ef8390) --- lib/libarchive/tests/functional_test.sh | 2 +- usr.bin/bsdcat/tests/functional_test.sh | 2 +- usr.bin/cpio/tests/functional_test.sh | 2 +- usr.bin/tar/tests/functional_test.sh | 4 ++-- usr.bin/unzip/tests/functional_test.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh index 191eae65f4dc..db3845b5e6f7 100755 --- a/lib/libarchive/tests/functional_test.sh +++ b/lib/libarchive/tests/functional_test.sh @@ -40,7 +40,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/bsdcat/tests/functional_test.sh b/usr.bin/bsdcat/tests/functional_test.sh index efed232374e2..27bf51298bb8 100755 --- a/usr.bin/bsdcat/tests/functional_test.sh +++ b/usr.bin/bsdcat/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/cpio/tests/functional_test.sh b/usr.bin/cpio/tests/functional_test.sh index a915cc91faea..6bc58e5236ae 100755 --- a/usr.bin/cpio/tests/functional_test.sh +++ b/usr.bin/cpio/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/tar/tests/functional_test.sh b/usr.bin/tar/tests/functional_test.sh index 39a73abd0a79..11f3cb6dd122 100755 --- a/usr.bin/tar/tests/functional_test.sh +++ b/usr.bin/tar/tests/functional_test.sh @@ -25,9 +25,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -export BSDTAR=$(which tar) SRCDIR=$(atf_get_srcdir) TESTER="${SRCDIR}/bsdtar_test" +export BSDTAR=$(which tar) check() { @@ -41,7 +41,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/unzip/tests/functional_test.sh b/usr.bin/unzip/tests/functional_test.sh index e668453d8882..c6b25cfc2e7e 100755 --- a/usr.bin/unzip/tests/functional_test.sh +++ b/usr.bin/unzip/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }"