On Mon, Sep 23, 2024 at 03:57:13PM +0800, An Long wrote: > Mount error info changed since util-linux v2.40 > (91ea38e libmount: report failed syscall name). > So update _filter_mount_error() to match it. > > Signed-off-by: An Long <lan@xxxxxxxx> > --- > tests/btrfs/315 | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/tests/btrfs/315 b/tests/btrfs/315 > index 5852afad..5101a9a3 100755 > --- a/tests/btrfs/315 > +++ b/tests/btrfs/315 > @@ -39,7 +39,11 @@ _filter_mount_error() > # mount: <mnt-point>: fsconfig system call failed: File exists. > # dmesg(1) may have more information after failed mount system > call. > > - grep -v dmesg | _filter_test_dir | sed -e > "s/mount(2)\|fsconfig//g" > + # For util-linux v2.4 and later: > + # mount: <mountpoint>: mount system call failed: File exists. > + > + grep -v dmesg | _filter_test_dir | sed -e > "s/mount(2)\|fsconfig//g" | \ > + sed -E "s/mount( system call failed:)/\1/" Oh, there's a local _filter_mount_error() in btrfs/315. I thought you can change the common helper _filter_error_mount() in common/filter. So maybe you can merge this _filter_mount_error into that common helper in another patch, then other test cases can use it. Thanks, Zorro > } > > seed_device_must_fail() > -- > 2.43.0 > >
