From owner-svn-src-head@freebsd.org Fri Feb 2 23:34:34 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0E2DED31F5; Fri, 2 Feb 2018 23:34:33 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A722486FBF; Fri, 2 Feb 2018 23:34:33 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DE592276B; Fri, 2 Feb 2018 23:34:33 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w12NYXuv080175; Fri, 2 Feb 2018 23:34:33 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w12NYXSd080174; Fri, 2 Feb 2018 23:34:33 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201802022334.w12NYXSd080174@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 2 Feb 2018 23:34:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328822 - head/usr.sbin/makefs/tests X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/usr.sbin/makefs/tests X-SVN-Commit-Revision: 328822 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Feb 2018 23:34:34 -0000 Author: brooks Date: Fri Feb 2 23:34:33 2018 New Revision: 328822 URL: https://svnweb.freebsd.org/changeset/base/328822 Log: Check for cd9660 support before attempting to mount created images This extends the set in r316028 to allow all tests to pass or be skipped on a system without cd9660 support. A better approach using tar is possible, but this works today. Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D10516 Modified: head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh Modified: head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh ============================================================================== --- head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh Fri Feb 2 23:26:52 2018 (r328821) +++ head/usr.sbin/makefs/tests/makefs_cd9660_tests.sh Fri Feb 2 23:34:33 2018 (r328822) @@ -96,8 +96,6 @@ D_flag_cleanup() atf_test_case F_flag cleanup F_flag_body() { - check_cd9660_support - create_test_inputs atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ @@ -106,6 +104,7 @@ 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 } @@ -117,8 +116,6 @@ F_flag_cleanup() atf_test_case from_mtree_spec_file cleanup from_mtree_spec_file_body() { - check_cd9660_support - create_test_inputs atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \ @@ -128,6 +125,7 @@ from_mtree_spec_file_body() $MAKEFS $TEST_IMAGE $TEST_SPEC_FILE cd - + check_cd9660_support mount_image check_base_iso9660_image_contents } @@ -139,8 +137,6 @@ from_mtree_spec_file_cleanup() atf_test_case from_multiple_dirs cleanup from_multiple_dirs_body() { - check_cd9660_support - test_inputs_dir2=$TMPDIR/inputs2 create_test_inputs @@ -152,6 +148,7 @@ 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 } @@ -163,13 +160,12 @@ from_multiple_dirs_cleanup() atf_test_case from_single_dir cleanup from_single_dir_body() { - check_cd9660_support - create_test_inputs 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 } @@ -190,6 +186,7 @@ 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 } @@ -213,6 +210,7 @@ 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 } @@ -231,6 +229,7 @@ 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 } @@ -247,6 +246,7 @@ 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 } @@ -267,6 +267,8 @@ o_flag_isolevel_3_body() else 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 @@ -334,6 +336,7 @@ 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,6 +368,7 @@ 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 }