Author: asomers
Date: Mon Jul 31 21:52:08 2017
New Revision: 321820
URL: https://svnweb.freebsd.org/changeset/base/321820
Log:
MFC r320163:
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
Sponsored by: Spectra Logic Corp
Modified:
stable/10/usr.sbin/makefs/tests/makefs_ffs_tests.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/makefs/tests/makefs_ffs_tests.sh
==============================================================================
--- stable/10/usr.sbin/makefs/tests/makefs_ffs_tests.sh Mon Jul 31 21:42:18
2017 (r321819)
+++ stable/10/usr.sbin/makefs/tests/makefs_ffs_tests.sh Mon Jul 31 21:52:08
2017 (r321820)
@@ -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()
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
