tests: explicitly specify 1k block sizes when creating test file systems

On the Hurd, mke2fs will force the use of 4k block sizes by default
because the Hurd's implemntation of ext2 doesn't support any other
block sizes.  This causes spurious test failures.  Since these test
are testing e2fsprogs functionality, force the use of 1k block sizes
so the test output matches the expected output.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index 39727ba6f73e5ee83bf0203718b5610c1339619f..04723f7230cfd9878ef437ddc6e7380ce86312aa 100644 (file)
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -13,7 +13,7 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
 
-$MKE2FS -Fq $TMPFILE 512 > /dev/null 2>&1
+$MKE2FS -Fq -b 1024 $TMPFILE 512 > /dev/null 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 

diff --git a/tests/d_special_files/script b/tests/d_special_files/script
index 9bdff5d005a435339f54f2155fd38d8978b06160..a8c28582e8bfeb9fbadc03e43d92d835534d0763 100644 (file)
--- a/tests/d_special_files/script
+++ b/tests/d_special_files/script
@@ -13,7 +13,7 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
 
-$MKE2FS -Fq $TMPFILE 512 > /dev/null 2>&1
+$MKE2FS -Fq -b 1024 -o linux $TMPFILE 512 > /dev/null 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 

diff --git a/tests/d_xattr_edits/script b/tests/d_xattr_edits/script
index cd9d039b2096f2c3a02e2a9131b288fa345c29a6..b6451ee77c27c86d9fd3a325c2804a455f703a54 100644 (file)
--- a/tests/d_xattr_edits/script
+++ b/tests/d_xattr_edits/script
@@ -13,7 +13,7 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
 
-$MKE2FS -Fq $TMPFILE 512 > /dev/null 2>&1
+$MKE2FS -Fq -b 1024 $TMPFILE 512 > /dev/null 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 

diff --git a/tests/d_xattr_sorting/script b/tests/d_xattr_sorting/script
index 459a66a5f01d4ef354dd55bca7be350981fcdce0..9e6e362dd8b48c69af545a922720bef1fa9318a2 100644 (file)
--- a/tests/d_xattr_sorting/script
+++ b/tests/d_xattr_sorting/script
@@ -13,7 +13,7 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/null 2>&1
 
 echo "mke2fs -Fq -b 1024 test.img 512" >> $OUT
 
-$MKE2FS -Fq $TMPFILE 512 > /dev/null 2>&1
+$MKE2FS -Fq -b 1024 $TMPFILE 512 > /dev/null 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 

diff --git a/tests/f_detect_xfs/script b/tests/f_detect_xfs/script
index b32ba85bd20b06b331b42df3a7fa470459a47e34..c80f0f7ec5ae0739a930ad757ec02f6d12db469f 100644 (file)
--- a/tests/f_detect_xfs/script
+++ b/tests/f_detect_xfs/script
@@ -21,7 +21,7 @@ test -x $DEBUGFS_EXE && $DEBUGFS_EXE -R 'quit' $TMPFILE >> $OUT 2>&1
 echo "*** tune2fs" >> $OUT
 $TUNE2FS -i 0 $TMPFILE >> $OUT 2>&1
 echo "*** mke2fs" >> $OUT
-$MKE2FS -n $TMPFILE >> $OUT 2>&1
+$MKE2FS -n -b 1024 $TMPFILE >> $OUT 2>&1
 
 sed -f $cmd_dir/filter.sed -e "s|$TMPFILE|test.img|g" < $OUT > $OUT.new
 mv $OUT.new $OUT