From: Matthias Andree Date: Tue, 1 Jul 2025 19:30:23 +0000 (+0200) Subject: Pass down autoconf's EGREP to the tests. X-Git-Tag: v1.47.3-rc3~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2023feb7121bc569d5d440ef901296ef20b64c38;p=thirdparty%2Fe2fsprogs.git Pass down autoconf's EGREP to the tests. Care was taken to make sure where to quote and where not to; variable assignments with EGREP=@EGREP@ need quoting in order not to split the variable into tokens; expansions in places where we used to invoke egrep need not because they actually need to split $EGREP contents in case it's "grep -E". This fixes "egrep is obsolescent" warnings on newer coreutils. Signed-off-by: Matthias Andree Signed-off-by: Theodore Ts'o --- diff --git a/tests/Makefile.in b/tests/Makefile.in index ba06b3b6b..678cc3268 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -9,6 +9,7 @@ top_builddir = .. my_dir = tests INSTALL = @INSTALL@ MKDIR_P = @MKDIR_P@ +EGREP = "@EGREP@" @MCONFIG@ @@ -24,6 +25,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_data.tmp @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one @echo "DD=@DD@" >>test_one + @echo 'EGREP="@EGREP@"' >>test_one @cat $(srcdir)/test_one.in >> test_one @chmod +x-w test_one diff --git a/tests/f_pre_1970_date_encoding/script b/tests/f_pre_1970_date_encoding/script index 952e550c3..8a14cbff0 100644 --- a/tests/f_pre_1970_date_encoding/script +++ b/tests/f_pre_1970_date_encoding/script @@ -24,7 +24,7 @@ create_file_with_xtime_and_extra() { get_file_xtime_and_extra() { name=$1 echo "times for $name =" >> $TIMESTAMPS - $DEBUGFS -R "stat $name" $TMPFILE 2>&1 | egrep '^( a| c| m|cr)time:' | + $DEBUGFS -R "stat $name" $TMPFILE 2>&1 | $EGREP '^( a| c| m|cr)time:' | sed 's/ --.*//' >> $TIMESTAMPS } diff --git a/tests/m_minrootdir/script b/tests/m_minrootdir/script index 4e2314ce1..22a703f27 100644 --- a/tests/m_minrootdir/script +++ b/tests/m_minrootdir/script @@ -36,7 +36,7 @@ stat /emptydir stat /dir stat /dir/file ENDL -$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" >> $OUT +$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | $EGREP "(stat|Size:|Type:)" >> $OUT cat > $TMPFILE.cmd << ENDL ex /emptyfile diff --git a/tests/m_rootdir/script b/tests/m_rootdir/script index 2e54ae109..f95ea14c8 100644 --- a/tests/m_rootdir/script +++ b/tests/m_rootdir/script @@ -37,7 +37,7 @@ stat /emptydir stat /dir stat /dir/file ENDL -$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" >> $OUT +$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | $EGREP "(stat|Size:|Type:)" >> $OUT cat > $TMPFILE.cmd << ENDL ex /emptyfile diff --git a/tests/m_rootdir_acl/script b/tests/m_rootdir_acl/script index 536319a13..6950dfb85 100644 --- a/tests/m_rootdir_acl/script +++ b/tests/m_rootdir_acl/script @@ -81,7 +81,7 @@ stat /dir/file stat /acl_dir stat /acl_dir/file ENDL -$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep "(stat|Size:|Type:)" >> $OUT +$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | $EGREP "(stat|Size:|Type:)" >> $OUT cat > $TMPFILE.cmd << ENDL ea_list dir/file diff --git a/tests/m_rootpaxtar/script b/tests/m_rootpaxtar/script index 41dc7c386..524b5267b 100644 --- a/tests/m_rootpaxtar/script +++ b/tests/m_rootpaxtar/script @@ -21,7 +21,7 @@ cat > $TMPFILE.cmd << ENDL stat /file ea_list /file ENDL -$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | egrep -v '^(crtime|Inode checksum):' >> $OUT +$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | $EGREP -v '^(crtime|Inode checksum):' >> $OUT $FSCK -f -n $TMPFILE >> $OUT 2>&1 diff --git a/tests/t_change_uuid/script b/tests/t_change_uuid/script index d568f4659..d35070acd 100755 --- a/tests/t_change_uuid/script +++ b/tests/t_change_uuid/script @@ -9,16 +9,16 @@ rm -f $OUT # Test command line option echo "create fs without metadata_csum" >> $OUT $MKE2FS -O ^metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_change_uuid_mcsum/script b/tests/t_change_uuid_mcsum/script index 4ec57767b..6a91ca23c 100755 --- a/tests/t_change_uuid_mcsum/script +++ b/tests/t_change_uuid_mcsum/script @@ -9,16 +9,16 @@ rm -f $OUT # Test command line option echo "create fs with metadata_csum" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_change_uuid_mcsum_mounted/script b/tests/t_change_uuid_mcsum_mounted/script index f94bfbbe3..9c6e5b1ba 100755 --- a/tests/t_change_uuid_mcsum_mounted/script +++ b/tests/t_change_uuid_mcsum_mounted/script @@ -9,16 +9,16 @@ rm -f $OUT # Test command line option echo "create fs with metadata_csum" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT EXT2FS_PRETEND_RW_MOUNT=1 $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_change_uuid_mcsum_seed_mounted/script b/tests/t_change_uuid_mcsum_seed_mounted/script index 19fdbed97..bc9156a77 100755 --- a/tests/t_change_uuid_mcsum_seed_mounted/script +++ b/tests/t_change_uuid_mcsum_seed_mounted/script @@ -9,34 +9,34 @@ rm -f $OUT # Test command line option echo "create fs with metadata_csum" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT EXT2FS_PRETEND_RW_MOUNT=1 $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn on csum seed" >> $OUT EXT2FS_PRETEND_RW_MOUNT=1 $TUNE2FS -O metadata_csuM_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT EXT2FS_PRETEND_RW_MOUNT=1 $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_change_uuid_mounted/script b/tests/t_change_uuid_mounted/script index 150f4510b..53b4edabc 100755 --- a/tests/t_change_uuid_mounted/script +++ b/tests/t_change_uuid_mounted/script @@ -9,16 +9,16 @@ rm -f $OUT # Test command line option echo "create fs without metadata_csum" >> $OUT $MKE2FS -O ^metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT EXT2FS_PRETEND_RW_MOUNT=1 $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_dangerous/script b/tests/t_dangerous/script index a6d3dc42e..b6cf045cb 100644 --- a/tests/t_dangerous/script +++ b/tests/t_dangerous/script @@ -85,7 +85,7 @@ $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1 status=$? echo Exit status is $status >> $OUT -$DUMPE2FS $TMPFILE 2> /dev/null | egrep '^(Filesystem features:|Filesystem UUID:|Inode size:)' > $OUT.before +$DUMPE2FS $TMPFILE 2> /dev/null | $EGREP '^(Filesystem features:|Filesystem UUID:|Inode size:)' > $OUT.before # add mcsum echo "tune2fs -O metadata_csum test.img" >> $OUT @@ -110,7 +110,7 @@ echo Exit status is $status >> $OUT $FSCK -yD -N test_filesys $TMPFILE >> $OUT 2>&1 # dump and check -$DUMPE2FS $TMPFILE 2> /dev/null | egrep '^(Filesystem features:|Filesystem UUID:|Inode size:)' > $OUT.after +$DUMPE2FS $TMPFILE 2> /dev/null | $EGREP '^(Filesystem features:|Filesystem UUID:|Inode size:)' > $OUT.after echo "Change in FS metadata:" >> $OUT diff -u $OUT.before $OUT.after | tail -n +3 >> $OUT $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1 diff --git a/tests/t_disable_changed_csum_seed/script b/tests/t_disable_changed_csum_seed/script index 449689a9e..4f52a5137 100755 --- a/tests/t_disable_changed_csum_seed/script +++ b/tests/t_disable_changed_csum_seed/script @@ -9,29 +9,29 @@ rm -f $OUT # Test command line option echo "create fs without csum_seed" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn on csum_seed" >> $OUT $TUNE2FS -O metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn off csum_seed" >> $OUT $TUNE2FS -O ^metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_disable_changed_csum_seed_mounted/script b/tests/t_disable_changed_csum_seed_mounted/script index ea2184f49..ccedc4ef7 100755 --- a/tests/t_disable_changed_csum_seed_mounted/script +++ b/tests/t_disable_changed_csum_seed_mounted/script @@ -9,29 +9,29 @@ rm -f $OUT # Test command line option echo "create fs without csum_seed" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn on csum_seed" >> $OUT $TUNE2FS -O metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change UUID" >> $OUT $TUNE2FS -U a61be2e0-b3b8-4fbc-b2cd-d84b306b9731 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn off csum_seed" >> $OUT EXT2FS_PRETEND_RW_MOUNT=1 $TUNE2FS -O ^metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_disable_csum_seed/script b/tests/t_disable_csum_seed/script index e762ad4ee..1d12ff755 100755 --- a/tests/t_disable_csum_seed/script +++ b/tests/t_disable_csum_seed/script @@ -9,25 +9,25 @@ rm -f $OUT # Test command line option echo "create fs without csum_seed" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn on csum_seed" >> $OUT $TUNE2FS -O metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn off csum_seed" >> $OUT $TUNE2FS -O ^metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_disable_meta_csum_and_seed/script b/tests/t_disable_meta_csum_and_seed/script index 52d7f6213..28d58c89f 100755 --- a/tests/t_disable_meta_csum_and_seed/script +++ b/tests/t_disable_meta_csum_and_seed/script @@ -9,26 +9,26 @@ rm -f $OUT # Test command line option echo "create fs without csum_seed" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn on csum_seed" >> $OUT $TUNE2FS -O metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn off metadata_csum" >> $OUT $TUNE2FS -O ^metadata_csum $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT $DUMPE2FS $TMPFILE 2>&1 | grep 'metadata_csum' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_enable_csum_seed/script b/tests/t_enable_csum_seed/script index 78ccbeb2f..a15e69e22 100755 --- a/tests/t_enable_csum_seed/script +++ b/tests/t_enable_csum_seed/script @@ -9,20 +9,20 @@ rm -f $OUT # Test command line option echo "create fs without csum_seed" >> $OUT $MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "turn on csum_seed" >> $OUT $TUNE2FS -O metadata_csum_seed $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change uuid" >> $OUT $TUNE2FS -U 1dd136c6-e47a-4833-9bf5-519f8aacabe4 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$? diff --git a/tests/t_format_csum_seed/script b/tests/t_format_csum_seed/script index 3038785ec..0261173be 100755 --- a/tests/t_format_csum_seed/script +++ b/tests/t_format_csum_seed/script @@ -9,16 +9,16 @@ rm -f $OUT # Test command line option echo "create fs with csum_seed" >> $OUT $MKE2FS -o Linux -O metadata_csum,metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "change uuid" >> $OUT $TUNE2FS -U 1dd136c6-e47a-4833-9bf5-519f8aacabe4 $TMPFILE > /dev/null 2>&1 -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT echo "check filesystem" >> $OUT $FSCK $FSCK_OPT -fy $TMPFILE > /dev/null 2>&1 echo "fsck returns $?" >> $OUT -$DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT +$DUMPE2FS $TMPFILE 2>&1 | $EGREP '(Checksum seed:|UUID)' >> $OUT cmp -s $OUT $EXP status=$?