From nobody Sun Feb 22 03:36:14 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 4fJV5B3hWjz6Sqmr for ; Sun, 22 Feb 2026 03:36:14 +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 4fJV5B1KxTz3LZf for ; Sun, 22 Feb 2026 03:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771731374; 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=X4138QG5RAuefXFNDTgAGSYgrtnN5xeEzZg9UNMWBFc=; b=LDiHkt1RPVp5G6j/Pd3v7tMnz/UDVyKUu2esLkyhUrF8Y+jAIGJKffkjs6ntKMhIadJW2y p4Cq0T0Cx74GX+yKF9AZjSd9tHrNr8WWFjTWQoW7Hf4C0hsFRDl7JzSok/nM38ZcIvaoCO 5FFcDnXXx0LZ9TCUM2yfdyoiqHXIRlF6FYlJqDNl40r2/aM2C5K+4JqSYxmSVNs9QOqfDh ygOSgF+i06QqyHkr1yqofsUQWgbzA5gjqDknVS19Y8Ml+cCfRSEtB/zuQfmRRQ/RgRuhZ9 X8gLnqouQLXRyGHgUAohOrLDAeuiKoFN9DsVji1+sG1m4Dv+nkJVRnlVdEgp2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771731374; a=rsa-sha256; cv=none; b=h8WEsFMcEkTd/MKXW0rwHrUpcBjN4sL8o7Q+RTFrwwgb00qZ2NL6jMuqkQeh8WjCdm6BbV N+NtlYoY1KF3VSi/YW9Dfv4zdA5IkAFpXz1iLkEeH7RgflmVZ6u94aIN/3Onem7i6LpurA Zi9Uloz26bpRKWQFa44qYa1OotE8P2ijaR55k0zHJepyCSq8CS6TBnV1s7B8xPRCBfOBm8 PlZhUAPtZIsg9WDOyWIIuW9csWX+lyF3dKd7Ue70uVFiCByWdeM8mfK3DuNbXWVFM9azL4 czLm1CYmvS9tkRwrlurHdOQFj+exFMwqtd+ZhCpgA9XNAPBLN75JW9kk3+7BoQ== 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=1771731374; 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=X4138QG5RAuefXFNDTgAGSYgrtnN5xeEzZg9UNMWBFc=; b=NqzoD72iE7jyJeAzfIJkOJec9MVcwHY7sMDAUtd6dR/Ar9bW89Yc6ZuoSx/L3IrqkLJvVu V2rlNaC3h56a81nZ3l3ZkbfcceKYvMzNL+mDXxG4b45HWX/kKy2awxs1km9ApHrZCYaXua jmGLNHH5eKsUb74AFIL/MGt2TJ8Szlf1U6xq7eL/JDKV6CuS9cE4UddAW4IZALrLNiCIay sjw5g5y+UKFDckY6rRaUTzHKNJC9KjbS2+jV05Ft2CdBUSjEm426rYUIJMFIjgjeiR9iC/ NFRtVh2xdqq8mh3PjDKVB7r18Mx1wspU8/RlJTQAEx4z+TGznP6AEKpkqUSkqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJV5B0ZXNzBt2 for ; Sun, 22 Feb 2026 03:36:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21cab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Feb 2026 03:36:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 02d896af3bca - stable/14 - t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 02d896af3bca3e2bf0432ca751ed3d4ec1ee543b Auto-Submitted: auto-generated Date: Sun, 22 Feb 2026 03:36:14 +0000 Message-Id: <699a79ae.21cab.41c01697@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=02d896af3bca3e2bf0432ca751ed3d4ec1ee543b commit 02d896af3bca3e2bf0432ca751ed3d4ec1ee543b Author: Enji Cooper AuthorDate: 2026-02-15 18:26:52 +0000 Commit: Enji Cooper CommitDate: 2026-02-22 03:35:31 +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