aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2018-03-24 11:39:09 -0400
committerTheodore Ts'o <tytso@mit.edu>2018-03-24 11:39:09 -0400
commit07d5857e53909257c45f78bf68a08f8fe7f6c250 (patch)
tree86ecbc8734aae4cd7764ea99463a27cb3194ceb5 /tests
parent63ae5ee05485314e3851ca7f9964e2620e2973fa (diff)
downloade2fsprogs-07d5857e53909257c45f78bf68a08f8fe7f6c250.tar.gz
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/d_loaddump/script2
-rw-r--r--tests/d_special_files/script2
-rw-r--r--tests/d_xattr_edits/script2
-rw-r--r--tests/d_xattr_sorting/script2
-rw-r--r--tests/f_detect_xfs/script2
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index 39727ba6f..04723f723 100644
--- 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 9bdff5d00..a8c28582e 100644
--- 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 cd9d039b2..b6451ee77 100644
--- 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 459a66a5f..9e6e362dd 100644
--- 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 b32ba85bd..c80f0f7ec 100644
--- 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