linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: An Long <lan@suse.com>
To: fstests@vger.kernel.org, linux-btrfs@vger.kernel.org
Cc: lan@suse.com
Subject: [PATCH v2] btrfs/315: update filter to match mount cmd
Date: Mon, 23 Sep 2024 15:57:13 +0800	[thread overview]
Message-ID: <29dc7fdf9dd8cfb05ece7d5eb07858529517022f.camel@suse.com> (raw)

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@suse.com>
---
 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/"
 }

 seed_device_must_fail()
-- 
2.43.0


             reply	other threads:[~2024-09-23  7:57 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-23  7:57 An Long [this message]
2024-09-23 11:29 ` [PATCH v2] btrfs/315: update filter to match mount cmd Filipe Manana
2024-09-23 13:30 ` Zorro Lang
2024-10-07 12:11   ` Filipe Manana
2024-10-11  6:03     ` Zorro Lang
2024-10-14  3:51       ` An Long

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=29dc7fdf9dd8cfb05ece7d5eb07858529517022f.camel@suse.com \
    --to=lan@suse.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).