From nobody Sun Feb 22 03:36:29 2026 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 4fJV5V0VSDz6Sr8X for ; Sun, 22 Feb 2026 03:36:30 +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 4fJV5T53ldz3M7r for ; Sun, 22 Feb 2026 03:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731389; 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=HxgC2kXAEjpUGogKuNxsgqPHWgWeaukzrGGlyXFsLZk=; b=oPjpSIYPRj31NbGoO9ZwMpEG1VifpkRSh3xdG1L2OFguAs/XK9/tjEKDvxgOjNXdc8mU/Z lyK5C1oJ/WTZ+p+EG2eWQb+SOUuJiTbsyc+VfoNGy3r/7XIh0RnYSvskiP1ALxv6S8iWbl bI79Pa8IXZ0klj+C2Uit8d0yQiF+u77bOHcBsiDxo+8izEP1yEuuvgPbFpaOmtgBgo1mhi eT468Koun87naY+0x2vRwLfR0a6PuLZNJxb+q1e1oUZeRZgrR7sKvntPkUwDkOnwNdqI42 T53fBcj/+pXcnbkmpWnADy28uCasCAV78eSg0F3uf2CHstpdohtG9U53xblLqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731389; a=rsa-sha256; cv=none; b=bj/l91gzsLvPrfhU4oq6DVgalKhiyeJwKTeqg3QDOfxWpu2sMWolVr+AfdSMTEzRf5T9sf uIXyrg+zFTtmcsq+yhS2zU0LfMC9GMNsZNW44Wdb2/P+v8FcMqzMHRD5A6/sPpLsCWbY2J AxjYHIbTLIJai90rcHenIzwp0Ds0Esz5KUONpwY7XVcZN3tyTEtpFfPpBMGZrLFCVzNT5p IT3+VpqrYMBLbHA86yFUw4H002vUfd5p1hmbyV2JDt6ucZCCdsmBFYGnGh2LsaaKvtXy6H fl6LFfd0/uhd7BmnCQ4eRDmRQRsWxqb+8ofMjqhwDJElvnMbb3jnwDYHgsrRdA== 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=1771731389; 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=HxgC2kXAEjpUGogKuNxsgqPHWgWeaukzrGGlyXFsLZk=; b=Y9N89U+ypm8Bsq1NT2vrsURbC+0tLz7UMFYypdx6qOY+0LyZX7BQRva4j46+gAhR6GghaI HNAgCTlmQ9TwJsUhN6IEfownJJdf8f7JDysyNlbH+R7gvx3g7+yvdQebjFEVMxjVQMOipP IWBJlbFRJp4B0O0DV0UMViQhJZ298oBmy9MsdmvlgH6+/+I7QXWkMuQLdZYYhqkjZwXt98 3COpAiDI/HoCB00liOmT0l1UGppCuctQ5ecVXGh7YTFz+ZPjLRz8XDjZcDpx3+20SuHx5W T+7JfLU6LrpEQDI7G91j33U1OmCDFXPlAUNyWmDu+amntKvedh0m3vohh9BmlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV5T4XcpzBjn for ; Sun, 22 Feb 2026 03:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21030 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:36:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 968d6ac0b83f - stable/15 - t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 968d6ac0b83f83249732401d5505882855067398 Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:36:29 +0000 Message-Id: <699a79bd.21030.af30916@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=968d6ac0b83f83249732401d5505882855067398 commit 968d6ac0b83f83249732401d5505882855067398 Author: Enji Cooper AuthorDate: 2026-02-15 18:26:52 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:36:25 +0000 t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods This particular change replaces all local modifications to the test script like so: - Use `ATF_TESTS_SH_SED_test` with a sed(1) statement in the Makefile, instead of the equivalent local modifications. - Remove the need for expecting the output of newfs_msdos to be empty. There isn't much to gain from deviating from the upstream NetBSD test--it's just another local modification that would need to be carried forward. If it's worth testing this FreeBSD-specific behavior, it should be in a FreeBSD-specific test. This makes moving new modifications to the script easier moving forward. MFC after: 1 week (cherry picked from commit 411a566d565277e47c9644d19a5efa0fe5b00179) --- contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh | 14 ++------------ sbin/newfs_msdos/tests/Makefile | 2 ++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh index 61ed927b8889..dc431166a469 100755 --- a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh +++ b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh @@ -31,21 +31,11 @@ validfat32_head() { } validfat32_body() { - if true; then - # FreeBSD - exp_err=empty - fsck=fsck_msdosfs - else - # NetBSD - exp_err=ignore - fsck=fsck_msdos - fi - - atf_check -s eq:0 -o ignore -e $exp_err \ + atf_check -s eq:0 -o ignore -e ignore \ newfs_msdos -b 512 -C 33m -F 32 msdos.img # fsck_msdos/newfs_msdos have been fixed # atf_expect_fail "PR bin/46743" - atf_check -s eq:0 -o not-match:FIXED -e empty $fsck -p msdos.img + atf_check -s eq:0 -o not-match:FIXED -e empty fsck_msdos -p msdos.img atf_expect_pass } diff --git a/sbin/newfs_msdos/tests/Makefile b/sbin/newfs_msdos/tests/Makefile index 3f112c7f4710..47c77d8289de 100644 --- a/sbin/newfs_msdos/tests/Makefile +++ b/sbin/newfs_msdos/tests/Makefile @@ -2,5 +2,7 @@ TESTSRC=${SRCTOP}/contrib/netbsd-tests/sbin/newfs_msdos NETBSD_ATF_TESTS_SH+= create +ATF_TESTS_SH_SED_create= -e 's/fsck_msdos/fsck_msdosfs/' + .include .include