tests: fix u_direct_io to work with older losetup

Older losetup does not have --sector-size, but this isn't really
needed for the test to work.  Instead specify the filesystem block
size directly to mke2fs, so that it works on all distros instead
of being skipped.

Change-Id: I5a0c82a9efdefd1b48f4d4288998c7725c9ae71e
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
index 830cbd7..b1511ef 100644 (file)
--- a/tests/u_direct_io/expect
+++ b/tests/u_direct_io/expect
@@ -1,4 +1,4 @@
-mke2fs -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP
+mke2fs -F -b 4096 -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP
 Creating filesystem with 32768 4k blocks and 32768 inodes
 
 Allocating group tables:    \b\b\bdone                            

diff --git a/tests/u_direct_io/script b/tests/u_direct_io/script
index b4f0775..2f80e64 100644 (file)
--- a/tests/u_direct_io/script
+++ b/tests/u_direct_io/script
@@ -8,14 +8,14 @@ elif test ! -x $DEBUGFS_EXE; then
     echo "$test_name: $DESCRIPTION: skipped (no debugfs)"
 else
     dd if=/dev/zero of=$TMPFILE bs=1M count=128 > /dev/null 2>&1
-    LOOP=$(losetup --show --sector-size 4096 -f $TMPFILE)
+    LOOP=$(losetup --show -f $TMPFILE 2>&1)
     if [ ! -b "$LOOP" ]; then
         echo "$test_name: $DESCRIPTION: skipped (no loop devices)"
         rm -f $TMPFILE
         exit 0
     fi
-    echo mke2fs -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D \$LOOP > $OUT
-    $MKE2FS -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP 2>&1 | \
+    echo mke2fs -F -b 4096 -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D \$LOOP > $OUT
+    $MKE2FS -F -b 4096 -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP 2>&1 | \
        sed -f $cmd_dir/filter.sed >> $OUT
 
     echo debugfs -D -R stats \$LOOP >> $OUT