r_resize_inode, m_dasd_bs, m_large_file, m_meta_bg, m_no_opt,

m_read_opt, m_std, run_mke2fs, filter_dumpe2fs: Make tests
portable so they pass correctly on a FreeBSD system.

2 files changed, 18 insertions, 27 deletions

diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect
index ad53134d..319060d1 100644
--- a/tests/r_resize_inode/expect
+++ b/tests/r_resize_inode/expect
@@ -1,4 +1,4 @@
-mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 16384
+mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384
 resize2fs test.img 65536
 Resizing the filesystem on ./test.img to 65536 (1k) blocks.
 The filesystem on ./test.img is now 65536 blocks long.
@@ -11,9 +11,9 @@ Pass 5: Checking group summary information
 test_filesys: 11/16384 files (0.0% non-contiguous), 4513/65536 blocks
 Exit status is 0
 dumpe2fs test.img
+
 Filesystem volume name:   <none>
 Last mounted on:          <not available>
-Filesystem UUID:          <none>
 Filesystem magic number:  0xEF53
 Filesystem revision #:    1 (dynamic)
 Filesystem features:      resize_inode filetype sparse_super
@@ -35,12 +35,9 @@ Fragments per group:      1024
 Inodes per group:         256
 Inode blocks per group:   32
 Mount count:              0
-Maximum mount count:      20
-Last checked:             Thu Jan  1 00:00:00 1970
 Check interval:           15552000 (6 months)
-Next check after:         Tue Jun 30 00:00:00 1970
-Reserved blocks uid:      0 (user root)
-Reserved blocks gid:      0 (group root)
+Reserved blocks uid:      0
+Reserved blocks gid:      0
 First inode:              11
 Inode size:		  128
 Default directory hash:   tea
@@ -449,7 +446,7 @@ Group 63: (Blocks 64513-65535)
   Free blocks: 64547-65535
   Free inodes: 16129-16384
 --------------------------------
-mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 65536
+mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536
 resize2fs test.img 16384
 Resizing the filesystem on ./test.img to 16384 (1k) blocks.
 The filesystem on ./test.img is now 16384 blocks long.
@@ -462,9 +459,9 @@ Pass 5: Checking group summary information
 test_filesys: 11/4096 files (0.0% non-contiguous), 2107/16384 blocks
 Exit status is 0
 dumpe2fs test.img
+
 Filesystem volume name:   <none>
 Last mounted on:          <not available>
-Filesystem UUID:          <none>
 Filesystem magic number:  0xEF53
 Filesystem revision #:    1 (dynamic)
 Filesystem features:      resize_inode filetype sparse_super
@@ -486,12 +483,9 @@ Fragments per group:      1024
 Inodes per group:         256
 Inode blocks per group:   32
 Mount count:              0
-Maximum mount count:      20
-Last checked:             Thu Jan  1 00:00:00 1970
 Check interval:           15552000 (6 months)
-Next check after:         Tue Jun 30 00:00:00 1970
-Reserved blocks uid:      0 (user root)
-Reserved blocks gid:      0 (group root)
+Reserved blocks uid:      0
+Reserved blocks gid:      0
 First inode:              11
 Inode size:		  128
 Default directory hash:   tea
@@ -622,9 +616,9 @@ test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesys: 11/41472 files (0.0% non-contiguous), 8361/165536 blocks
 Exit status is 1
 dumpe2fs test.img
+
 Filesystem volume name:   <none>
 Last mounted on:          <not available>
-Filesystem UUID:          <none>
 Filesystem magic number:  0xEF53
 Filesystem revision #:    1 (dynamic)
 Filesystem features:      resize_inode filetype sparse_super
@@ -646,12 +640,9 @@ Fragments per group:      1024
 Inodes per group:         256
 Inode blocks per group:   32
 Mount count:              0
-Maximum mount count:      20
-Last checked:             Thu Jan  1 00:00:00 1970
 Check interval:           15552000 (6 months)
-Next check after:         Tue Jun 30 00:00:00 1970
-Reserved blocks uid:      0 (user root)
-Reserved blocks gid:      0 (group root)
+Reserved blocks uid:      0
+Reserved blocks gid:      0
 First inode:              11
 Inode size:		  128
 Default directory hash:   tea
diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script
index 7a97eed6..339345c8 100644
--- a/tests/r_resize_inode/script
+++ b/tests/r_resize_inode/script
@@ -12,8 +12,8 @@ cp /dev/null $OUT
 
 dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
-echo mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 16384 > $OUT
-$MKE2FS -q -F -O resize_inode -b 1024 -g 1024 $TMPFILE 16384 2>&1 \
+echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384 > $OUT
+$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 16384 2>&1 \
 	| sed -e '1d' | grep -v "automatically checked" | 
 	grep -v "whichever comes first" >> $OUT 
 
@@ -32,12 +32,12 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
 echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -e '1d' | grep -v "time: " >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
 
 echo "--------------------------------" >> $OUT
 
-echo mke2fs -q -F -O resize_inode -b 1024 -g 1024 test.img 65536 >> $OUT
-$MKE2FS -q -F -O resize_inode -b 1024 -g 1024 $TMPFILE 65536 2>&1 \
+echo mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536 >> $OUT
+$MKE2FS -q -F -O resize_inode -o Linux -b 1024 -g 1024 $TMPFILE 65536 2>&1 \
 	| sed -e '1d' | grep -v "automatically checked" | 
 	grep -v "whichever comes first" >> $OUT 
 
@@ -56,7 +56,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
 echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -e '1d' | grep -v "time: " >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT
 
 echo "--------------------------------" >> $OUT
 
@@ -75,7 +75,7 @@ $DEBUGFS -R "set_super_value mkfs_time 0" -w $TMPFILE >/dev/null 2>&1
 $TUNE2FS -c 20 -U clear $TMPFILE  >/dev/null 2>&1
 
 echo dumpe2fs test.img >> $OUT
-$DUMPE2FS $TMPFILE 2>&1 | sed -e '1d' | grep -v "time: " >> $OUT
+$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs >> $OUT