From nobody Thu Jan 15 19:44:58 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 4dsYNW0Kqcz6PMJT for ; Thu, 15 Jan 2026 19:44:59 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dsYNV6hT9z40tg for ; Thu, 15 Jan 2026 19:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768506298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TX2OWy+aEuPUwTrxjcoYYRDN09PKG/qEBegsONsIlI=; b=MrAPApbc0fTRrqHYA5eE7BoBixgEJQ+lvQCVD9keXk6og1wmTenMfoyXon5V+SjX5vN/EL 3G6IO0JqFSvKNGSKQ/FiqmS7rSVWz/AWtflbWnjZTuXfg+kB2Ya1QVR3VkLMlC2qe2L4zD 44zJcbeUojzj6iTPQjNkPT/yz1B21sAv6c5gJJSV24tTDnTOnToY8lQH0qyuJlCf2SuS0l jOIyA3Le443UUPeImMJrnlXVCnDpg6EGD24ZW5IR9NEPFtMJdeir5a9Rft37Tr/OINGmzp a5x9IUbAtJS/cWj0OrwKsCWWeB86e2T9Ws9MjsxtjauVTQ/1L/xznoIeRyK7gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768506298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1TX2OWy+aEuPUwTrxjcoYYRDN09PKG/qEBegsONsIlI=; b=sPwUlquXFOhpf3yqR0RVUNPL7dic6our101Z+5NTdu4O/EAoEO4CmROgwJNnX2rUloMeYx eUB38FaSXAYmLsb28PmUqxCffqhwpTdNjs+3lBZ849CU3wm8ut7aA4CWAWxlE3sijFZJd3 Eb6J5z/9p25tpa57y/FhyfDrXdF0ZEyDpyT3EbNareTjcKL1hgVCIqDW4NOmYuFv3DM3uP Ft+giZJjbRxgBVEyE5JHV8/KKGbE2/qfegbtrE8OU8liXnhRqO0YFPvPGhaIEeDUtXhKYK n/onDZpjdCeaQGdv9N1UPyUtlGQl0/ccrVld+57ha2qtLLKkRtwfo+9MhO4P7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768506298; a=rsa-sha256; cv=none; b=h/ns/pEK7VM7nTlcBjQ+cNB5++G8sU6txOYxgzFwmVcUW/tpjyNlMUNhZ3Eu1KmKjCqPXJ kPt2Q94G4nJfwUXl71Y168Z50U9ERsF9aVApxJFmRkB07aTB0busOWPG/NMAPBWy+zTcBZ xYvstmt6FvLtHjhUFznXqwogiu86s+d1q9Tw1FgXYElHIH21wDTD7mD8akhtzhuIeTKuNr 7F+eqrcKw9jFpLMudbLZiFqabvFf1vNKd3vEKD8bLRBScg256buAwtXZdx3OvvjmMf4Ner z8yAJ81Aob4NWlvauutCR2rWHoMzYENs65f79oiy3X+swhaftGjFolrlg7vK0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dsYNV6FpCzjPr for ; Thu, 15 Jan 2026 19:44:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 81f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 15 Jan 2026 19:44:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Jose Luis Duran Subject: git: 10a4af98c688 - stable/15 - makefs/tests: Use require.kmods property instead of ad-hoc checks 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 10a4af98c6888552f39b80331356289128af3fdf Auto-Submitted: auto-generated Date: Thu, 15 Jan 2026 19:44:58 +0000 Message-Id: <696943ba.81f6.42d9fca9@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=10a4af98c6888552f39b80331356289128af3fdf commit 10a4af98c6888552f39b80331356289128af3fdf Author: Siva Mahadevan AuthorDate: 2025-07-24 12:13:56 +0000 Commit: Jose Luis Duran CommitDate: 2026-01-15 19:36:52 +0000 makefs/tests: Use require.kmods property instead of ad-hoc checks Signed-off-by: Siva Mahadevan MFC after: 3 days Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/1870 (cherry picked from commit 2cd31bd8fa687922d2a571ae53456ecd2e9ba095) --- usr.sbin/makefs/tests/Makefile | 2 ++ usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 19 ------------------- usr.sbin/makefs/tests/makefs_msdos_tests.sh | 8 -------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 748bafa06211..5c9ba983acdc 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -2,9 +2,11 @@ ATF_TESTS_SH+= makefs_cd9660_tests TEST_METADATA.makefs_cd9660_tests+= required_files="/sbin/mount_cd9660" +TEST_METADATA.makefs_cd9660_tests+= required_kmods="cd9660" ATF_TESTS_SH+= makefs_ffs_tests ATF_TESTS_SH+= makefs_msdos_tests TEST_METADATA.makefs_msdos_tests+= required_files="/sbin/mount_msdosfs" +TEST_METADATA.makefs_msdos_tests+= required_kmods="msdosfs" .if ${MK_ZFS} != "no" ATF_TESTS_SH+= makefs_zfs_tests .endif diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh index e058dfc57b7b..b36753de3393 100644 --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh @@ -58,11 +58,6 @@ check_base_iso9660_image_contents() atf_check -e empty -o empty -s exit:0 test -f $TEST_MOUNT_DIR/c } -check_cd9660_support() { - kldstat -m cd9660 || \ - atf_skip "Requires cd9660 filesystem support to be present in the kernel" -} - atf_test_case D_flag cleanup D_flag_body() { @@ -101,7 +96,6 @@ F_flag_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -F $TEST_SPEC_FILE -M 1m $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -122,7 +116,6 @@ from_mtree_spec_file_body() $MAKEFS $TEST_IMAGE $TEST_SPEC_FILE cd - - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -145,7 +138,6 @@ from_multiple_dirs_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS $TEST_IMAGE $TEST_INPUTS_DIR $test_inputs_dir2 - check_cd9660_support mount_image check_base_iso9660_image_contents -d $test_inputs_dir2 } @@ -162,7 +154,6 @@ from_single_dir_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -183,7 +174,6 @@ o_flag_allow_deep_trees_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o allow-deep-trees $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -207,7 +197,6 @@ o_flag_allow_max_name_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o allow-max-name $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -226,7 +215,6 @@ o_flag_isolevel_1_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o isolevel=1 $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -243,7 +231,6 @@ o_flag_isolevel_2_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o isolevel=2 $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -265,7 +252,6 @@ o_flag_isolevel_3_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o isolevel=3 $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_base_iso9660_image_contents fi @@ -333,7 +319,6 @@ o_flag_rockridge_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o rockridge $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_image_contents -X .rr_moved @@ -365,7 +350,6 @@ o_flag_rockridge_dev_nodes_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -o rockridge $TEST_IMAGE $TEST_INPUTS_DIR - check_cd9660_support mount_image check_image_contents } @@ -378,7 +362,6 @@ atf_test_case T_flag_dir cleanup T_flag_dir_body() { timestamp=1742574909 - check_cd9660_support create_test_dirs mkdir -p $TEST_INPUTS_DIR/dir1 @@ -436,7 +419,6 @@ T_flag_mtree_body() atf_check -e empty -o empty -s exit:0 \ $MAKEFS -T $timestamp -o rockridge $TEST_IMAGE $TEST_SPEC_FILE - check_cd9660_support mount_image eval $(stat -s $TEST_MOUNT_DIR/dir1) atf_check_equal $st_atime $timestamp @@ -456,7 +438,6 @@ duplicate_names_head() } duplicate_names_body() { - check_cd9660_support create_test_dirs # Create three directories which are identical in the first 31 characters. diff --git a/usr.sbin/makefs/tests/makefs_msdos_tests.sh b/usr.sbin/makefs/tests/makefs_msdos_tests.sh index fb94429b477b..ce246f3d268c 100644 --- a/usr.sbin/makefs/tests/makefs_msdos_tests.sh +++ b/usr.sbin/makefs/tests/makefs_msdos_tests.sh @@ -43,12 +43,6 @@ common_cleanup() mdconfig -d -u $test_md_device || : } -check_msdosfs_support() -{ - kldstat -m msdosfs || \ - atf_skip "Requires msdosfs filesystem support to be present in the kernel" -} - atf_test_case T_flag_dir cleanup T_flag_dir_body() { @@ -56,7 +50,6 @@ T_flag_dir_body() "The msdos backend saves the wrong timestamp value" \ "(possibly due to the 2s resolution for FAT timestamp)" timestamp=1742574909 - check_msdosfs_support create_test_dirs mkdir -p $TEST_INPUTS_DIR/dir1 @@ -106,7 +99,6 @@ atf_test_case T_flag_mtree cleanup T_flag_mtree_body() { timestamp=1742574908 # Even value, timestamp precision is 2s. - check_msdosfs_support create_test_dirs mkdir -p $TEST_INPUTS_DIR/dir1