Author: ngie
Date: Mon Nov  2 11:06:51 2015
New Revision: 290270
URL: https://svnweb.freebsd.org/changeset/base/290270

Log:
  Add testcases for -t ffs -o version=[12]
  
  Verify the filesystem type using dumpfs. Add preliminary support
  for NetBSD (needs to be validated)
  
  MFC after: 1 week
  Sponsored by: EMC / Isilon Storage Division

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      Mon Nov  2 10:39:26 
2015        (r290269)
+++ head/usr.sbin/makefs/tests/makefs_ffs_tests.sh      Mon Nov  2 11:06:51 
2015        (r290270)
@@ -158,6 +158,70 @@ from_single_dir_cleanup()
        common_cleanup
 }
 
+atf_test_case o_flag_version_1 cleanup
+o_flag_version_1_body()
+{
+       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 empty -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()
+{
+       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 empty -o match:"$ffs_label" dumpfs $TEST_MOUNT_DIR
+       check_ffs_image_contents
+}
+o_flag_version_2_cleanup()
+{
+       common_cleanup
+}
+
 atf_init_test_cases()
 {
 
@@ -168,5 +232,6 @@ atf_init_test_cases()
        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
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to