Index: usr.sbin/makefs/tests/makefs_cd9660_tests.sh =================================================================== --- usr.sbin/makefs/tests/makefs_cd9660_tests.sh +++ usr.sbin/makefs/tests/makefs_cd9660_tests.sh @@ -91,14 +91,16 @@ atf_test_case F_flag cleanup F_flag_body() { + sysctl kern.cam.cd.timeout || atf_skip "Requires 'device cd' to be present" + 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 empty -s exit:0 \ $MAKEFS -F $TEST_SPEC_FILE -M 1m $TEST_IMAGE $TEST_INPUTS_DIR mount_image check_base_iso9660_image_contents } @@ -110,15 +112,17 @@ atf_test_case from_mtree_spec_file cleanup from_mtree_spec_file_body() { + sysctl kern.cam.cd.timeout || atf_skip "Requires 'device cd' to be present" + 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 empty -s exit:0 \ $MAKEFS $TEST_IMAGE $TEST_SPEC_FILE cd - mount_image check_base_iso9660_image_contents } @@ -130,17 +134,19 @@ atf_test_case from_multiple_dirs cleanup from_multiple_dirs_body() { + sysctl kern.cam.cd.timeout || atf_skip "Requires 'device cd' to be present" + 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 empty -s exit:0 \ $MAKEFS $TEST_IMAGE $TEST_INPUTS_DIR $test_inputs_dir2 mount_image check_base_iso9660_image_contents -d $test_inputs_dir2 } @@ -152,11 +158,13 @@ atf_test_case from_single_dir cleanup from_single_dir_body() { + sysctl kern.cam.cd.timeout || atf_skip "Requires 'device cd' to be present" + create_test_inputs atf_check -e empty -o empty -s exit:0 \ $MAKEFS $TEST_IMAGE $TEST_INPUTS_DIR mount_image check_base_iso9660_image_contents }