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 <matthias.andree@gmx.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ba06b3b6b91f58a0ee5167c6e80cd3d949e409bd..678cc3268c72893f90affc19bcd56a421105f962 100644 (file)
--- 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 952e550c3bf0a967658c3323748ba6db9605a9ce..8a14cbff0220289b80f7d2593ff292a76dfaef8a 100644 (file)
--- 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 4e2314ce165d74e509723d10af904447971b7a72..22a703f270db4b782a26e39ec02f5cc7257f043b 100644 (file)
--- 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 2e54ae1095259c8d223c18478706e068b6cbddf5..f95ea14c8cd4e190a1f7a1383bf7fe14da857f67 100644 (file)
--- 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 536319a13a0723d3238ad3299236ed7c7a6bee88..6950dfb85be550ac5f3f1fac3f48f17f66030c3c 100644 (file)
--- 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 41dc7c386f3be311b288a0bca5b3d6f69b0e4dcf..524b5267bb764358d378743956e9ab6887064456 100644 (file)
--- 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 d568f46595778b6d33f3364d4b174d74edcfb3a3..d35070acd8c280e63ac6b1b76234a5dc16049d7e 100755 (executable)
--- 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 4ec57767b34c2333c6823e0df40c806040a56e96..6a91ca23c90cdc817039fedc91577b8acd85b1fd 100755 (executable)
--- 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 f94bfbbe3bbde03e2d80f3ab903d6ad90985e026..9c6e5b1ba8b30dd2911dcf43869b7f1d0e547f6e 100755 (executable)
--- 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 19fdbed97dd4765738b5913b1a6310d57ec182d3..bc9156a777326d74b44e9867b1f3e174fa803674 100755 (executable)
--- 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 150f4510b881b3639c14c4f0091d607d6e39fa35..53b4edabc056e5f52fde6874280477550ca7560a 100755 (executable)
--- 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 a6d3dc42e8c541ba7c2ed92f9a63eb26f545ba24..b6cf045cbbe0ebe757842d78232906efa10315a0 100644 (file)
--- 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 449689a9e6aff0045a950b04dd0ee58723d2c812..4f52a5137fad33759dff7bf26aa2503baf755f2e 100755 (executable)
--- 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 ea2184f49c0fefbc2c7dcfd7564ff8bf1c7989d0..ccedc4ef79a2e80686bd3fc3d1174b2f8fd4f6a7 100755 (executable)
--- 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 e762ad4eef8e03bc72e1154140b4e853f0074fc9..1d12ff75566f3997fadf1495ea7991b8cfb55dd0 100755 (executable)
--- 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 52d7f621326baa084ecec5967b07d5355d4af044..28d58c89f1c65d51c05d4f60106dba386d1a1f82 100755 (executable)
--- 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 78ccbeb2fafb0292bf637c8121290f12a40fa6fe..a15e69e227a6e9916144b056f219892bece529ed 100755 (executable)
--- 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 3038785ec79198d5fcc3a5b7f94c041028135fa8..0261173beb4e3b95e03dc20ced2877121d8841fa 100755 (executable)
--- 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=$?