diff mbox series

btrfs: fix grep warning at _require_btrfs_mkfs_uuid_option()

Message ID ef2df19486ef71adccd14b3df0bf475ecc7f3b38.1709737287.git.fdmanana@suse.com (mailing list archive)
State New, archived
Headers show
Series btrfs: fix grep warning at _require_btrfs_mkfs_uuid_option() | expand

Commit Message

Filipe Manana March 6, 2024, 3:01 p.m. UTC 
From: Filipe Manana <fdmanana@suse.com>

When running _require_btrfs_mkfs_uuid_option(), some grep versions
complain about escaping the dash characters and make the tests that
use this function fail like this:

  btrfs/313       2s - output mismatch (see /root/fstests/results//btrfs_normal/btrfs/313.out.bad)
      --- tests/btrfs/313.out	2024-03-05 18:48:34.929372495 +0000
      +++ /root/fstests/results//btrfs_normal/btrfs/313.out.bad	2024-03-05 20:52:27.745166101 +0000
      @@ -1,5 +1,8 @@
       QA output created by 313
       ---- clone_uuids_verify_tempfsid ----
      +grep: warning: stray \ before -
      +grep: warning: stray \ before -
      +grep: warning: stray \ before -
       Mounting original device
       On disk fsid:		FSID
      ...
      (Run 'diff -u /root/fstests/tests/btrfs/313.out /root/fstests/results//btrfs_normal/btrfs/313.out.bad'  to see the entire diff)
  btrfs/314       3s - output mismatch (see /root/fstests/results//btrfs_normal/btrfs/314.out.bad)
      --- tests/btrfs/314.out	2024-03-05 18:48:34.929372495 +0000
      +++ /root/fstests/results//btrfs_normal/btrfs/314.out.bad	2024-03-05 20:52:32.880237216 +0000
      @@ -1,6 +1,9 @@
       QA output created by 314

       From non-tempfsid SCRATCH_MNT to tempfsid TEST_DIR/314/tempfsid_mnt
      +grep: warning: stray \ before -
      +grep: warning: stray \ before -
      +grep: warning: stray \ before -
       wrote 9000/9000 bytes at offset 0
      ...

So fix this by not escaping anymore the dashes and using the -- separator
before the regex pattern parameter.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 common/btrfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Disseldorp March 6, 2024, 10:59 p.m. UTC | #1 
On Wed,  6 Mar 2024 15:01:57 +0000, fdmanana@kernel.org wrote:
...
>  	cnt=$($MKFS_BTRFS_PROG --help 2>&1 | \
> -				grep -E --count "\-\-uuid|\-\-device-uuid")
> +				grep -E --count -- "--uuid|--device-uuid")
>  	if [ $cnt != 2 ]; then
>  		_notrun "Require $MKFS_BTRFS_PROG with --uuid and --device-uuid options"
>  	fi

Reviewed-by: David Disseldorp <ddiss@suse.de>
Anand Jain March 7, 2024, 6:17 a.m. UTC | #2 
looks good.

Reviewed-by: Anand Jain <anand.jain@oracle.com>

Thanks.
diff mbox series

Patch

diff --git a/common/btrfs b/common/btrfs
index 3eb2a91b..aa344706 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -93,7 +93,7 @@  _require_btrfs_mkfs_uuid_option()
 	local cnt
 
 	cnt=$($MKFS_BTRFS_PROG --help 2>&1 | \
-				grep -E --count "\-\-uuid|\-\-device-uuid")
+				grep -E --count -- "--uuid|--device-uuid")
 	if [ $cnt != 2 ]; then
 		_notrun "Require $MKFS_BTRFS_PROG with --uuid and --device-uuid options"
 	fi