btrfs/053: fix test failure when running with btrfs-progs v6.0+
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 2/3 btrfs/053: fix test failure when running with btrfs-progs v6.0+
From: Filipe Manana <[email protected]>
In btrfs-progs v6.0 the --leafsize (-l) command line option was removed from mkfs.btrfs, so btrfs/053 can fail with v6.0+ in case the scratch device does not have a btrfs filesystem created before running the test, in which case mounting the scratch device fails.
The change was introduced by the following btrfs-progs commit:
f7a768d62498 ("btrfs-progs: mkfs: remove support for option --leafsize")
Change the test to use --nodesize (-n) instead, since it exists in both old and new btrfs-progs versions. Also redirect mkfs output to the test's log file and fail explicitly if mkfs failed.
--- tests/btrfs/053 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/btrfs/053 +2 -2
@@ -44,7 +44,7 @@ send_files_dir=$TEST_DIR/btrfs-test-$seq rm -fr $send_files_dir mkdir $send_files_dir -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1 +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount echo "hello world" > $SCRATCH_MNT/foobar
@@ -72,7 +72,7 @@ _run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ _scratch_unmount _check_scratch_fs -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1 +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount _run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT
Signature · 1 line
2.35.1
Quoted 9 lines · On Wed, Nov 09, 2022 at 04:44:57PM +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
In btrfs-progs v6.0 the --leafsize (-l) command line option was removed from mkfs.btrfs, so btrfs/053 can fail with v6.0+ in case the scratch device does not have a btrfs filesystem created before running the test, in which case mounting the scratch device fails.
The change was introduced by the following btrfs-progs commit:
Quoted 8 lines
f7a768d62498("btrfs-progs: mkfs: remove support for option --leafsize")Change the test to use --nodesize (-n) instead, since it exists in both old and new btrfs-progs versions. Also redirect mkfs output to the test's log file and fail explicitly if mkfs failed.
Signed-off-by Filipe Manana <[email protected]>---
This version looks good to me, thanks for fixing this.
Quoted 28 lines
tests/btrfs/053 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tests/btrfs/053 +2
-2@@ -44,7 +44,7 @@ send_files_dir=$TEST_DIR/btrfs-test-$seq rm -fr $send_files_dir mkdir $send_files_dir -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1 +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount echo "hello world" > $SCRATCH_MNT/foobar@@ -72,7 +72,7 @@ _run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ _scratch_unmount _check_scratch_fs -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1 +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount _run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNTSignature · 1 line
2.35.1
Quoted 9 lines · On 2022/11/10 00:44, [email protected] wrote:
From: Filipe Manana <[email protected]>
In btrfs-progs v6.0 the --leafsize (-l) command line option was removed from mkfs.btrfs, so btrfs/053 can fail with v6.0+ in case the scratch device does not have a btrfs filesystem created before running the test, in which case mounting the scratch device fails.
The change was introduced by the following btrfs-progs commit:
Quoted 7 lines
f7a768d62498("btrfs-progs: mkfs: remove support for option --leafsize")Change the test to use --nodesize (-n) instead, since it exists in both old and new btrfs-progs versions. Also redirect mkfs output to the test's log file and fail explicitly if mkfs failed.
Signed-off-by Filipe Manana <[email protected]>
Thanks,
Qu
Quoted 26 lines
--- tests/btrfs/053 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tests/btrfs/053 +2
-2@@ -44,7 +44,7 @@ send_files_dir=$TEST_DIR/btrfs-test-$seq rm -fr $send_files_dir mkdir $send_files_dir -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1 +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount echo "hello world" > $SCRATCH_MNT/foobar@@ -72,7 +72,7 @@ _run_btrfs_util_prog send -p $SCRATCH_MNT/mysnap1 -f $send_files_dir/2.snap \ _scratch_unmount _check_scratch_fs -_scratch_mkfs "-l $leaf_size" >/dev/null 2>&1 +_scratch_mkfs "--nodesize $leaf_size" >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount _run_btrfs_util_prog receive -f $send_files_dir/1.snap $SCRATCH_MNT