f_dup_de, r_resize_inode: change ">& /dev/null" to ">/dev/null 2>&1"

for compatibility with FreeBSD. In $DEBUGFS commands, move the
-R arg argument first so that systems with non-GNU getopt()
can see the request argument (they would otherwise stop
parsing at the first non-option argument).

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 413a54e..02214bb 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-13  Matthias Andree  <matthias.andree@gmx.de>
+
+       * f_dup_de, r_resize_inode: change ">& /dev/null" to ">/dev/null 2>&1"
+               for compatibility with FreeBSD. In $DEBUGFS commands, move the
+               -R arg argument first so that systems with non-GNU getopt()
+               can see the request argument (they would otherwise stop
+               parsing at the first non-option argument).
+
 2004-12-24  Theodore Ts'o  <tytso@mit.edu>
 
        * f_resize_inode, r_resize_inode: New tests to e2fsck and

diff --git a/tests/f_dup_de/script b/tests/f_dup_de/script
index ee583f3..0cef9ba 100644 (file)
--- a/tests/f_dup_de/script
+++ b/tests/f_dup_de/script
@@ -1,6 +1,6 @@
 if test "$HTREE"x = x -o "$HTREE_CLR"x = yx; then
        gunzip < $test_dir/image.gz > $TMPFILE
-       $DEBUGFS -w -R "feature ^dir_index" $TMPFILE >& /dev/null
+       $DEBUGFS -w -R "feature ^dir_index" $TMPFILE >/dev/null 2>&1
        gzip $TMPFILE
        IMAGE="$TMPFILE".gz
        EXP1=$test_dir/expect-nohtree.1

diff --git a/tests/r_resize_inode/script b/tests/r_resize_inode/script
index 364dcbc..7a97eed 100644 (file)
--- a/tests/r_resize_inode/script
+++ b/tests/r_resize_inode/script
@@ -26,10 +26,10 @@ echo Exit status is $status >> $OUT.new
 sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d'  | tr -d \\015 >> $OUT
 rm -f $OUT.new
 
-$DEBUGFS -w $TMPFILE -R "set_super_value lastcheck 0" >& /dev/null
-$DEBUGFS -w $TMPFILE -R "set_super_value hash_seed null" >& /dev/null
-$DEBUGFS -w $TMPFILE -R "set_super_value mkfs_time 0" >& /dev/null
-$TUNE2FS -c 20 -U clear $TMPFILE  >& /dev/null
+$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
+$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
+$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
@@ -50,10 +50,10 @@ echo Exit status is $status >> $OUT.new
 sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d'  | tr -d \\015 >> $OUT
 rm -f $OUT.new
 
-$DEBUGFS -w $TMPFILE -R "set_super_value lastcheck 0" >& /dev/null
-$DEBUGFS -w $TMPFILE -R "set_super_value hash_seed null" >& /dev/null
-$DEBUGFS -w $TMPFILE -R "set_super_value mkfs_time 0" >& /dev/null
-$TUNE2FS -c 20 -U clear $TMPFILE  >& /dev/null
+$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
+$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
+$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
@@ -69,10 +69,10 @@ echo Exit status is $status >> $OUT.new
 sed -e '1d' $OUT.new | sed -e '/^JFS DEBUG:/d'  | tr -d \\015 >> $OUT
 rm -f $OUT.new
 
-$DEBUGFS -w $TMPFILE -R "set_super_value lastcheck 0" >& /dev/null
-$DEBUGFS -w $TMPFILE -R "set_super_value hash_seed null" >& /dev/null
-$DEBUGFS -w $TMPFILE -R "set_super_value mkfs_time 0" >& /dev/null
-$TUNE2FS -c 20 -U clear $TMPFILE  >& /dev/null
+$DEBUGFS -R "set_super_value lastcheck 0" -w $TMPFILE >/dev/null 2>&1
+$DEBUGFS -R "set_super_value hash_seed null" -w $TMPFILE >/dev/null 2>&1
+$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