Index: head/usr.sbin/fstyp/tests/fstyp_test.sh
===================================================================
--- head/usr.sbin/fstyp/tests/fstyp_test.sh	(revision 362550)
+++ head/usr.sbin/fstyp/tests/fstyp_test.sh	(revision 362551)
@@ -1,290 +1,281 @@
 #!/bin/sh
 #
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
 # Copyright (c) 2015 Alan Somers
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
 # $FreeBSD$
 
 atf_test_case cd9660
 cd9660_head() {
 	atf_set "descr" "fstyp(8) should detect cd9660 filesystems"
 }
 cd9660_body() {
 	atf_check -s exit:0 mkdir -p dir/emptydir	# makefs requires a nonempty directory
 	atf_check -s exit:0 -o ignore makefs -t cd9660 -Z -s 64m cd9660.img dir
 	atf_check -s exit:0 -o inline:"cd9660\n" fstyp cd9660.img
 	atf_check -s exit:0 -o inline:"cd9660\n" fstyp -l cd9660.img
 }
 
 atf_test_case cd9660_label
 cd9660_label_head() {
 	atf_set "descr" "fstyp(8) can read the label on a cd9660 filesystem"
 }
 cd9660_label_body() {
 	atf_check -s exit:0 mkdir -p dir/emptydir	# makefs requires a nonempty directory
 	atf_check -s exit:0 -o ignore makefs -t cd9660 -o label=Foo -Z -s 64m cd9660.img dir
 	atf_check -s exit:0 -o inline:"cd9660\n" fstyp cd9660.img
 	# Note: cd9660 labels are always upper case
 	atf_check -s exit:0 -o inline:"cd9660 FOO\n" fstyp -l cd9660.img
 }
 
 atf_test_case dir
 dir_head() {
 	atf_set "descr" "fstyp(8) should fail on a directory"
 }
 dir_body() {
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:1 -e match:"not a disk" fstyp dir
 }
 
 atf_test_case exfat
 exfat_head() {
 	atf_set "descr" "fstyp(8) can detect exFAT filesystems"
 }
 exfat_body() {
 	bzcat $(atf_get_srcdir)/dfr-01-xfat.img.bz2 > exfat.img
 	atf_check -s exit:0 -o inline:"exfat\n" fstyp -u exfat.img
 }
 
 atf_test_case exfat_label
 exfat_label_head() {
 	atf_set "descr" "fstyp(8) can read exFAT labels"
 }
 exfat_label_body() {
 	bzcat $(atf_get_srcdir)/dfr-01-xfat.img.bz2 > exfat.img
 	atf_check -s exit:0 -o inline:"exfat exFat\n" fstyp -u -l exfat.img
 }
 
 atf_test_case empty
 empty_head() {
 	atf_set "descr" "fstyp(8) should fail on an empty file"
 }
 empty_body() {
 	atf_check -s exit:0 touch empty
 	atf_check -s exit:1 -e match:"filesystem not recognized" fstyp empty
 }
 
 atf_test_case ext2
 ext2_head() {
 	atf_set "descr" "fstyp(8) can detect ext2 filesystems"
 }
 ext2_body() {
 	bzcat $(atf_get_srcdir)/ext2.img.bz2 > ext2.img
 	atf_check -s exit:0 -o inline:"ext2fs\n" fstyp ext2.img
 	atf_check -s exit:0 -o inline:"ext2fs\n" fstyp -l ext2.img
 }
 
 atf_test_case ext3
 ext3_head() {
 	atf_set "descr" "fstyp(8) can detect ext3 filesystems"
 }
 ext3_body() {
 	bzcat $(atf_get_srcdir)/ext3.img.bz2 > ext3.img
 	atf_check -s exit:0 -o inline:"ext2fs\n" fstyp ext3.img
 	atf_check -s exit:0 -o inline:"ext2fs\n" fstyp -l ext3.img
 }
 
 atf_test_case ext4
 ext4_head() {
 	atf_set "descr" "fstyp(8) can detect ext4 filesystems"
 }
 ext4_body() {
 	bzcat $(atf_get_srcdir)/ext4.img.bz2 > ext4.img
 	atf_check -s exit:0 -o inline:"ext2fs\n" fstyp ext4.img
 	atf_check -s exit:0 -o inline:"ext2fs\n" fstyp -l ext4.img
 }
 
 atf_test_case ext4_label
 ext4_label_head() {
 	atf_set "descr" "fstyp(8) can read the label on an ext4 filesystem"
 }
 ext4_label_body() {
 	bzcat $(atf_get_srcdir)/ext4_with_label.img.bz2 > ext4_with_label.img
 	atf_check -s exit:0 -o inline:"ext2fs foo\n" fstyp -l ext4_with_label.img
 }
 
 atf_test_case fat12
 fat12_head() {
 	atf_set "descr" "fstyp(8) can detect FAT12 filesystems"
 }
 fat12_body() {
 	atf_check -s exit:0 truncate -s 64m msdos.img
 	atf_check -s exit:0 -o ignore -e ignore newfs_msdos -F 12 ./msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp -l msdos.img
 }
 
 atf_test_case fat16
 fat16_head() {
 	atf_set "descr" "fstyp(8) can detect FAT16 filesystems"
 }
 fat16_body() {
 	atf_check -s exit:0 truncate -s 64m msdos.img
 	atf_check -s exit:0 -o ignore -e ignore newfs_msdos -F 16 ./msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp -l msdos.img
 }
 
 atf_test_case fat32
 fat32_head() {
 	atf_set "descr" "fstyp(8) can detect FAT32 filesystems"
 }
 fat32_body() {
 	atf_check -s exit:0 truncate -s 64m msdos.img
 	atf_check -s exit:0 -o ignore -e ignore newfs_msdos -F 32 -c 1 \
 		./msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp -l msdos.img
 }
 
 atf_test_case fat32_label
 fat32_label_head() {
 	atf_set "descr" "fstyp(8) can read the label on an msdos filesystem"
 }
 fat32_label_body() {
 	atf_check -s exit:0 truncate -s 64m msdos.img
 	atf_check -s exit:0 -o ignore -e ignore newfs_msdos -F 32 -L Foo -c 1 \
 		./msdos.img
 	atf_check -s exit:0 -o inline:"msdosfs\n" fstyp msdos.img
 	# Note: msdos labels are always upper case
 	atf_check -s exit:0 -o inline:"msdosfs FOO\n" fstyp -l msdos.img
 }
 
 atf_test_case ntfs
 ntfs_head() {
 	atf_set "descr" "fstyp(8) can detect ntfs filesystems"
 }
 ntfs_body() {
 	bzcat $(atf_get_srcdir)/ntfs.img.bz2 > ntfs.img
 	atf_check -s exit:0 -o inline:"ntfs\n" fstyp ntfs.img
 	atf_check -s exit:0 -o inline:"ntfs\n" fstyp -l ntfs.img
 }
 
 atf_test_case ntfs_with_label
 ntfs_with_label_head() {
 	atf_set "descr" "fstyp(8) can read labels on ntfs filesystems"
 }
 ntfs_with_label_body() {
 	bzcat $(atf_get_srcdir)/ntfs_with_label.img.bz2 > ntfs_with_label.img
 	atf_check -s exit:0 -o inline:"ntfs\n" fstyp ntfs_with_label.img
 	atf_check -s exit:0 -o inline:"ntfs Foo\n" fstyp -l ntfs_with_label.img
 }
 
 atf_test_case ufs1
 ufs1_head() {
 	atf_set "descr" "fstyp(8) should detect UFS version 1 filesystems"
 }
 ufs1_body() {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:0 -o ignore makefs -Z -s 64m ufs.img dir
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp -l ufs.img
 }
 
 atf_test_case ufs2
 ufs2_head() {
 	atf_set "descr" "fstyp(8) should detect UFS version 2 filesystems"
 }
 ufs2_body() {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:0 -o ignore makefs -o version=2 -Z -s 64m ufs.img dir
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp -l ufs.img
 }
 
 atf_test_case ufs2_label
 ufs2_label_head() {
 	atf_set "descr" "fstyp(8) can read the label on a UFS v2 filesystem"
 }
 ufs2_label_body() {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:0 -o ignore makefs -o version=2,label="foo" -Z -s 64m ufs.img dir
 	atf_check -s exit:0 -o inline:"ufs foo\n" fstyp -l ufs.img
 }
 
 atf_test_case ufs_on_device cleanup
 ufs_on_device_head() {
 	atf_set "descr" "fstyp(8) should work on device nodes"
 	atf_set "require.user" "root"
 }
 ufs_on_device_body() {
 	mdconfig -a -t swap -s 64m > mdname
 	md=$(cat mdname)
 	if [ -z "$md" ]; then
 		atf_fail "Failed to create md(4) device"
 	fi
 	atf_check -s exit:0 -o ignore newfs -L foo /dev/$md
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp /dev/$md
 	atf_check -s exit:0 -o inline:"ufs foo\n" fstyp -l /dev/$md
 }
 ufs_on_device_cleanup() {
 	md=$(cat mdname)
 	if [ -n "$md" ]; then
 		mdconfig -d -u "$md"
 	fi
 }
 
 atf_test_case zeros
 zeros_head() {
 	atf_set "descr" "fstyp(8) should fail on a zero-filled file"
 }
 zeros_body() {
 	atf_check -s exit:0 truncate -s 256m zeros
 	atf_check -s exit:1 -e match:"filesystem not recognized" fstyp zeros
 }
 
 
 atf_init_test_cases() {
 	atf_add_test_case cd9660
 	atf_add_test_case cd9660_label
 	atf_add_test_case dir
 	atf_add_test_case empty
 	atf_add_test_case exfat
 	atf_add_test_case exfat_label
 	atf_add_test_case ext2
 	atf_add_test_case ext3
 	atf_add_test_case ext4
 	atf_add_test_case ext4_label
 	atf_add_test_case fat12
 	atf_add_test_case fat16
 	atf_add_test_case fat32
 	atf_add_test_case fat32_label
 	atf_add_test_case ntfs
 	atf_add_test_case ntfs_with_label
 	atf_add_test_case ufs1
 	atf_add_test_case ufs2
 	atf_add_test_case ufs2_label
 	atf_add_test_case ufs_on_device
 	atf_add_test_case zeros
 }
Index: head/usr.sbin/makefs/tests/makefs_ffs_tests.sh
===================================================================
--- head/usr.sbin/makefs/tests/makefs_ffs_tests.sh	(revision 362550)
+++ head/usr.sbin/makefs/tests/makefs_ffs_tests.sh	(revision 362551)
@@ -1,286 +1,262 @@
 #
 # Copyright 2015 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 # $FreeBSD$
 #
 
 MAKEFS="makefs -t ffs"
 MOUNT="mount"
 
 . "$(dirname "$0")/makefs_tests_common.sh"
 
 TEST_TUNEFS_OUTPUT=$TMPDIR/tunefs.output
 
 common_cleanup()
 {
 	if ! test_md_device=$(cat $TEST_MD_DEVICE_FILE); then
 		echo "$TEST_MD_DEVICE_FILE could not be opened; has an md(4) device been attached?"
 		return
 	fi
 
 	umount -f /dev/$test_md_device || :
 	mdconfig -d -u $test_md_device || :
 }
 
 check_ffs_image_contents()
 {
 	atf_check -e save:$TEST_TUNEFS_OUTPUT -o empty -s exit:0 \
 	    tunefs -p /dev/$(cat $TEST_MD_DEVICE_FILE)
 
 	check_image_contents "$@"
 }
 
 # With no -M, -m, or -s options, makefs should autocalculate the image size
 atf_test_case autocalculate_image_size cleanup
 autocalculate_image_size_body()
 {
 	atf_expect_fail "PR 229929 makefs(8) can underestimate image size"
 	create_test_inputs
 
 	atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
 	    mtree -c -k "$DEFAULT_MTREE_KEYWORDS" -p $TEST_INPUTS_DIR
 
 	cd $TEST_INPUTS_DIR
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS $TEST_IMAGE $TEST_SPEC_FILE
 	cd -
 
 	mount_image
 	check_ffs_image_contents
 }
 autocalculate_image_size_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case D_flag cleanup
 D_flag_body()
 {
 	atf_skip "makefs crashes with SIGBUS with dupe mtree entries; see FreeBSD bug # 192839"
 
 	create_test_inputs
 
 	atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
 	    mtree -cp $TEST_INPUTS_DIR
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -F $TEST_SPEC_FILE -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
 
 	atf_check -e empty -o empty -s exit:0 \
 	    cp $TEST_SPEC_FILE spec2.mtree
 	atf_check -e empty -o save:dupe_$TEST_SPEC_FILE -s exit:0 \
 	    cat $TEST_SPEC_FILE spec2.mtree
 
 	atf_check -e empty -o not-empty -s not-exit:0 \
 	    $MAKEFS -F dupe_$TEST_SPEC_FILE -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -D -F dupe_$TEST_SPEC_FILE -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
 }
 D_flag_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case F_flag cleanup
 F_flag_body()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
-
 	create_test_inputs
 
 	atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
 	    mtree -cp $TEST_INPUTS_DIR
 
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -F $TEST_SPEC_FILE -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
 
 	mount_image
 	check_ffs_image_contents
 }
 F_flag_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case from_mtree_spec_file cleanup
 from_mtree_spec_file_body()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
-
 	create_test_inputs
 
 	atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
 	    mtree -c -k "$DEFAULT_MTREE_KEYWORDS" -p $TEST_INPUTS_DIR
 
 	cd $TEST_INPUTS_DIR
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -M 1m $TEST_IMAGE $TEST_SPEC_FILE
 	cd -
 
 	mount_image
 	check_ffs_image_contents
 }
 from_mtree_spec_file_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case from_multiple_dirs cleanup
 from_multiple_dirs_body()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
-
 	test_inputs_dir2=$TMPDIR/inputs2
 
 	create_test_inputs
 
 	atf_check -e empty -o empty -s exit:0 mkdir -p $test_inputs_dir2
 	atf_check -e empty -o empty -s exit:0 \
 	    touch $test_inputs_dir2/multiple_dirs_test_file
 
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -M 1m $TEST_IMAGE $TEST_INPUTS_DIR $test_inputs_dir2
 
 	mount_image
 	check_image_contents -d $test_inputs_dir2
 }
 from_multiple_dirs_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case from_single_dir cleanup
 from_single_dir_body()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
-
 	create_test_inputs
 
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -M 1m $TEST_IMAGE $TEST_INPUTS_DIR
 
 	mount_image
 	check_ffs_image_contents
 }
 from_single_dir_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case o_flag_version_1 cleanup
 o_flag_version_1_body()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
-
 	ffs_version=1
 
 	platform=$(uname)
 	case "$platform" in
 	FreeBSD)
 		ffs_label=UFS${ffs_version}
 		;;
 	NetBSD)
 		ffs_label=FFSv${ffs_version}
 		;;
 	*)
 		atf_skip "Unsupported platform"
 		;;
 	esac
 
 	create_test_inputs
 
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -M 1m -o version=$ffs_version $TEST_IMAGE $TEST_INPUTS_DIR
 
 	mount_image
 	atf_check -e ignore -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
 	check_ffs_image_contents
 }
 o_flag_version_1_cleanup()
 {
 	common_cleanup
 }
 
 atf_test_case o_flag_version_2 cleanup
 o_flag_version_2_body()
 {
-	if [ "$(atf_config_get ci false)" = "true" ]; then
-		atf_skip "https://bugs.freebsd.org/247425"
-	fi
-
 	ffs_version=2
 
 	platform=$(uname)
 	case "$platform" in
 	FreeBSD)
 		ffs_label=UFS${ffs_version}
 		;;
 	NetBSD)
 		ffs_label=FFSv${ffs_version}
 		;;
 	*)
 		atf_skip "Unsupported platform"
 		;;
 	esac
 
 	create_test_inputs
 
 	atf_check -e empty -o not-empty -s exit:0 \
 	    $MAKEFS -M 1m -o version=$ffs_version $TEST_IMAGE $TEST_INPUTS_DIR
 
 	mount_image
 	atf_check -e ignore -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
 	check_ffs_image_contents
 }
 o_flag_version_2_cleanup()
 {
 	common_cleanup
 }
 
 atf_init_test_cases()
 {
 
 	atf_add_test_case autocalculate_image_size
 
 	atf_add_test_case D_flag
 	atf_add_test_case F_flag
 
 	atf_add_test_case from_mtree_spec_file
 	atf_add_test_case from_multiple_dirs
 	atf_add_test_case from_single_dir
 
 	atf_add_test_case o_flag_version_1
 	atf_add_test_case o_flag_version_2
 }