[PATCH] btrfs/146: fix failure due to missing test number argument for fsync-err

[PATCH] btrfs/146: fix failure due to missing test number argument for fsync-err

[fdmanana]

From: Filipe Manana <fdmanana@suse.com>

After commit 88c0291d297c ("fstests: per-test dmerror instances") the
script src/dmerror now has an extra argument, corresponding to a test's
sequence number, but btrfs/146 isn't passing that argument so the test
fails like this:

  $ ./check btrfs/146
  FSTYP         -- btrfs
  PLATFORM      -- Linux/x86_64 debian0 6.13.0-rc1-btrfs-next-181+ #1 SMP PREEMPT_DYNAMIC Tue Dec  3 13:03:23 WET 2024
  MKFS_OPTIONS  -- /dev/sdc
  MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1

  btrfs/146 3s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/146.out.bad)
      --- tests/btrfs/146.out	2020-06-10 19:29:03.818519162 +0100
      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/146.out.bad	2024-12-10 17:19:40.363498130 +0000
      @@ -1,3 +1,4 @@
       QA output created by 146
       Format and mount
      -Test passed!
      +Usage: /home/fdmanana/git/hub/xfstests/src/dmerror {load_error_table|load_working_table}
      +system: program exited: 1
      ...
      (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/146.out /home/fdmanana/git/hub/xfstests/results//btrfs/146.out.bad'  to see the entire diff)
  Ran: btrfs/146
  Failures: btrfs/146
  Failed 1 of 1 tests

Fix this by passing the test's sequence number as an argument.

Fixes: 88c0291d297c ("fstests: per-test dmerror instances")
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 tests/btrfs/146 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/btrfs/146 b/tests/btrfs/146
index d6d2829a..c1243757 100755
--- a/tests/btrfs/146
+++ b/tests/btrfs/146
@@ -57,7 +57,7 @@ _require_fs_space $SCRATCH_MNT $write_kb
 testfile=$SCRATCH_MNT/fsync-err-test
 
 SCRATCH_DEV=$old_SCRATCH_DEV
-$here/src/fsync-err -b $(($write_kb * 1024)) -d $here/src/dmerror $testfile
+$here/src/fsync-err -b $(($write_kb * 1024)) -d "$here/src/dmerror $seq" $testfile
 
 # success, all done
 _dmerror_load_working_table
-- 
2.45.2

Re: [PATCH] btrfs/146: fix failure due to missing test number argument for fsync-err

[Qu Wenruo]

在 2024/12/11 04:04, fdmanana@kernel.org 写道:
> From: Filipe Manana <fdmanana@suse.com>
> 
> After commit 88c0291d297c ("fstests: per-test dmerror instances") the
> script src/dmerror now has an extra argument, corresponding to a test's
> sequence number, but btrfs/146 isn't passing that argument so the test
> fails like this:
> 
>    $ ./check btrfs/146
>    FSTYP         -- btrfs
>    PLATFORM      -- Linux/x86_64 debian0 6.13.0-rc1-btrfs-next-181+ #1 SMP PREEMPT_DYNAMIC Tue Dec  3 13:03:23 WET 2024
>    MKFS_OPTIONS  -- /dev/sdc
>    MOUNT_OPTIONS -- /dev/sdc /home/fdmanana/btrfs-tests/scratch_1
> 
>    btrfs/146 3s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/146.out.bad)
>        --- tests/btrfs/146.out	2020-06-10 19:29:03.818519162 +0100
>        +++ /home/fdmanana/git/hub/xfstests/results//btrfs/146.out.bad	2024-12-10 17:19:40.363498130 +0000
>        @@ -1,3 +1,4 @@
>         QA output created by 146
>         Format and mount
>        -Test passed!
>        +Usage: /home/fdmanana/git/hub/xfstests/src/dmerror {load_error_table|load_working_table}
>        +system: program exited: 1
>        ...
>        (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/146.out /home/fdmanana/git/hub/xfstests/results//btrfs/146.out.bad'  to see the entire diff)
>    Ran: btrfs/146
>    Failures: btrfs/146
>    Failed 1 of 1 tests
> 
> Fix this by passing the test's sequence number as an argument.
> 
> Fixes: 88c0291d297c ("fstests: per-test dmerror instances")
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu

> ---
>   tests/btrfs/146 | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/btrfs/146 b/tests/btrfs/146
> index d6d2829a..c1243757 100755
> --- a/tests/btrfs/146
> +++ b/tests/btrfs/146
> @@ -57,7 +57,7 @@ _require_fs_space $SCRATCH_MNT $write_kb
>   testfile=$SCRATCH_MNT/fsync-err-test
>   
>   SCRATCH_DEV=$old_SCRATCH_DEV
> -$here/src/fsync-err -b $(($write_kb * 1024)) -d $here/src/dmerror $testfile
> +$here/src/fsync-err -b $(($write_kb * 1024)) -d "$here/src/dmerror $seq" $testfile
>   
>   # success, all done
>   _dmerror_load_working_table