Author: asomers
Date: Tue Jun 20 19:00:55 2017
New Revision: 320163
URL: https://svnweb.freebsd.org/changeset/base/320163
Log:
Fix usr.sbin/makefs/makefs_ffs_tests when /etc/fstab does not exist
dumpfs prints a harmless warning message (via ufs_disk_fillout(3) and
getfsfile(3)), when /etc/fstab does not exist. We can ignore it.
PR: 220165
Reported by: gjb
MFC after: 3 weeks
Sponsored by: Spectra Logic Corp
Modified:
head/usr.sbin/makefs/tests/makefs_ffs_tests.sh
Modified: head/usr.sbin/makefs/tests/makefs_ffs_tests.sh
==============================================================================
--- head/usr.sbin/makefs/tests/makefs_ffs_tests.sh Tue Jun 20 18:52:35
2017 (r320162)
+++ head/usr.sbin/makefs/tests/makefs_ffs_tests.sh Tue Jun 20 19:00:55
2017 (r320163)
@@ -182,7 +182,7 @@ o_flag_version_1_body()
$MAKEFS -M 1m -o version=$ffs_version $TEST_IMAGE $TEST_INPUTS_DIR
mount_image
- atf_check -e empty -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
+ atf_check -e ignore -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
check_ffs_image_contents
}
o_flag_version_1_cleanup()
@@ -214,7 +214,7 @@ o_flag_version_2_body()
$MAKEFS -M 1m -o version=$ffs_version $TEST_IMAGE $TEST_INPUTS_DIR
mount_image
- atf_check -e empty -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
+ atf_check -e ignore -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
check_ffs_image_contents
}
o_flag_version_2_cleanup()
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
