ChangeLog, expect, script:
d_loaddump: Fix test script to remove bash'isms, and make the shell
script more robust in cases where the user has overridden CFLAGS so
that the debugfs binary isn't compiled with -g, and is smaller than
128k. Also specify the blocksize to be used explictly to avoid
problems with people who change the mke2fs default parameters.
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 3564e59..3e1f672 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-01 Theodore Tso <tytso@valinux.com>
+
+ * d_loaddump: Fix test script to remove bash'isms, and make the
+ shell script more robust in cases where the user has
+ overridden CFLAGS so that the debugfs binary isn't
+ compiled with -g, and is smaller than 128k. Also specify
+ the blocksize to be used explictly to avoid problems with
+ people who change the mke2fs default parameters.
+
2001-05-25 Theodore Tso <tytso@valinux.com>
* Release of E2fsprogs 1.20
diff --git a/tests/d_loaddump/expect b/tests/d_loaddump/expect
index 14d6a20..5469a83 100644
--- a/tests/d_loaddump/expect
+++ b/tests/d_loaddump/expect
@@ -1,5 +1,5 @@
debugfs load/dump test
-mke2fs -Fq ./test.img 512
+mke2fs -Fq -b 1024 ./test.img 512
Exit status is 0
debugfs -R ''write test.data test_data'' -w ./test.img
Allocated inode: 12
diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index a030b89..2fd5969 100644
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -7,15 +7,15 @@
echo "debugfs load/dump test" > $OUT
-dd if=/dev/zero of=$TMPFILE bs=1k count=512 >& /dev/null
+dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
-echo "mke2fs -Fq $TMPFILE 512" >> $OUT
+echo "mke2fs -Fq -b 1024 $TMPFILE 512" >> $OUT
-$MKE2FS -Fq $TMPFILE 512 >& /dev/null
+$MKE2FS -Fq $TMPFILE 512 > /dev/null 2>&1
status=$?
echo Exit status is $status >> $OUT
-dd if=$DEBUGFS of=$TEST_DATA bs=1k count=128 >& /dev/null
+dd if=$DEBUGFS of=$TEST_DATA bs=128k count=1 conv=sync > /dev/null 2>&1
echo "file fragment odd size" >> $TEST_DATA
echo "debugfs -R ''write $TEST_DATA test_data'' -w $TMPFILE" > $OUT.new