diff mbox series

tests: fix u_direct_io to work with older losetup

Message ID 1673323535-14317-1-git-send-email-adilger@dilger.ca
State Accepted
Headers show
Series tests: fix u_direct_io to work with older losetup | expand

Commit Message

Andreas Dilger Jan. 10, 2023, 4:05 a.m. UTC 
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@dilger.ca>
---
 tests/u_direct_io/expect | 2 +-
 tests/u_direct_io/script | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Theodore Ts'o March 17, 2023, 4:10 a.m. UTC | #1 
On Mon, 9 Jan 2023 21:05:35 -0700, Andreas Dilger wrote:
> 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.
> 
> 

Applied, thanks!

[1/1] tests: fix u_direct_io to work with older losetup
      commit: 46413097b9ae8c14d1a4f16b43106eaa3ac4c16a

Best regards,
diff mbox series

Patch

diff --git a/tests/u_direct_io/expect b/tests/u_direct_io/expect
index 830cbd752652..b1511ef10aa9 100644
--- 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:    done                            
diff --git a/tests/u_direct_io/script b/tests/u_direct_io/script
index b4f07752c89f..2f80e640293f 100644
--- 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