From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6E05ECAAD8 for ; Tue, 20 Sep 2022 03:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229678AbiITDUN (ORCPT ); Mon, 19 Sep 2022 23:20:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229717AbiITDUJ (ORCPT ); Mon, 19 Sep 2022 23:20:09 -0400 Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A8353845E for ; Mon, 19 Sep 2022 20:20:05 -0700 (PDT) Received: by mail-qv1-xf2e.google.com with SMTP id j8so1137203qvt.13 for ; Mon, 19 Sep 2022 20:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=ldLRlTS0SrlL1ItIc7aq8/OWhJNQeg3zOlwBTS1U8hY=; b=CiVd0bD2WwkRtydFZmOkMiyiz1jjpDc2fkMxXZLPTxbngyX7M9RmAwww1EKRtm+G2X 3qgwFsaJvTFQ5imEvJhWUotP6yn0MV8BBA+qjpGmXUrP5NPQXFKo5TjQ68cOg71+QMMr +yr+EjVD+iHCNlm4H5shnSLAHqdlpF9+8zDEq4HFmOOFlSK9i9WheEw+v4mchiUxsPn1 9xjZztZlP8sgFymiDESoq/9fyo2oE82czQEqBQaFrTRTDxiiq4tYjnM8MjkZZED7ujlt KVKh6yH3zqG8H4W71byEQNYdAHVKhn6KuUw86p7ugrRX7/y0+Mm0xKgbz24OXi8WRDEn Kpfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=ldLRlTS0SrlL1ItIc7aq8/OWhJNQeg3zOlwBTS1U8hY=; b=vw8JBCNEb5JQvgJggKfhO5e8UsNJaX16j3B51WA3mM3bN2qk5Ssi0CiwLzeWgk8ic8 04AQIl8vbMkcfdXjHsw8u5wmqf7ZycAbej9j2EaPrrD/00O9LbxyJcuwIZLVZAxWHeLR 3FZ4zr18d4MA2DLFCxaFq4I73vyKe0nRsQiwwjoLXSUrq+XgUiUyDGBjd7TwJcpHKJih mCoq5syM29MujnKxRV/Uc2tFsyMxGc9Hw9leM1Fogf2CrFG4yIDxYNceFHz0a6URjjTE GSfbKp4TT0ccftY5nsm6ow3F3zziq3o1JDz5tHzSvNC+OmnAws9gwTepcgFO63QxIaSL mvGg== X-Gm-Message-State: ACrzQf1Lh7dIgu4PblXPyJkKjbxCZ9lH1GI+8y4CEtMwqrXCVm50+2BF gQE6ZoZxG8N/GZYnyg/E14iLehURIsVAgQ== X-Google-Smtp-Source: AMsMyM58CIc6wKc/EbgA5MjkRmksO8BPL/1oa1ZPp/fv/tfRFRwW5N0nU/KsDGc7KpyGIlh6Fhbe/Q== X-Received: by 2002:a0c:aa9e:0:b0:4a0:4909:6742 with SMTP id f30-20020a0caa9e000000b004a049096742mr17683608qvb.100.1663644003047; Mon, 19 Sep 2022 20:20:03 -0700 (PDT) Received: from xzhouw.hosts.qa.psi.rdu2.redhat.com ([66.187.232.127]) by smtp.gmail.com with ESMTPSA id m22-20020a05620a24d600b006b942f4ffe3sm225149qkn.18.2022.09.19.20.20.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Sep 2022 20:20:02 -0700 (PDT) From: Murphy Zhou To: fstests@vger.kernel.org Subject: [PATCH v2 1/2] egrep, fgrep: deprecated Date: Tue, 20 Sep 2022 11:19:50 +0800 Message-Id: <20220920031951.2098839-1-jencce.kernel@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Since this grep commit: commit a9515624709865d480e3142fd959bccd1c9372d1 Author: Paul Eggert Date: Sun Aug 15 10:52:13 2021 -0700 egrep, fgrep: now obsolete egrep will trigger a warning like: +egrep: warning: egrep is obsolescent; using grep -E This will break many gold output. Signed-off-by: Murphy Zhou --- v1-->v2: rebased on for-next branch check | 2 +- common/btrfs | 4 ++-- common/dmlogwrites | 2 +- common/dump | 4 ++-- common/encrypt | 4 ++-- common/filter | 2 +- common/fuzzy | 6 +++--- common/populate | 2 +- common/quota | 8 ++++---- common/rc | 36 ++++++++++++++++++------------------ common/repair | 2 +- common/xfs | 12 ++++++------ tests/btrfs/011 | 2 +- tests/btrfs/100 | 2 +- tests/btrfs/101 | 2 +- tests/btrfs/187 | 2 +- tests/btrfs/252 | 2 +- tests/ext4/006 | 2 +- tests/generic/164 | 2 +- tests/generic/165 | 2 +- tests/generic/454 | 2 +- tests/generic/670 | 2 +- tests/xfs/008 | 2 +- tests/xfs/012 | 2 +- tests/xfs/033 | 2 +- tests/xfs/064 | 4 ++-- tests/xfs/065 | 2 +- tests/xfs/083 | 2 +- tests/xfs/122 | 4 ++-- tests/xfs/138 | 2 +- tests/xfs/185 | 2 +- tests/xfs/186 | 4 ++-- tests/xfs/293 | 2 +- tests/xfs/330 | 2 +- tests/xfs/422 | 2 +- tests/xfs/499 | 2 +- tests/xfs/505 | 2 +- tests/xfs/514 | 2 +- tests/xfs/515 | 2 +- tests/xfs/517 | 2 +- tests/xfs/520 | 2 +- tests/xfs/530 | 2 +- tests/xfs/539 | 2 +- 43 files changed, 76 insertions(+), 76 deletions(-) diff --git a/check b/check index 000e31cb..af23572c 100755 --- a/check +++ b/check @@ -389,7 +389,7 @@ if $have_test_arg; then test_name=`basename $t` group_file=$SRC_DIR/$test_dir/group.list - if egrep -q "^$test_name" $group_file; then + if grep -Eq "^$test_name" $group_file; then # in group file ... OK echo $SRC_DIR/$test_dir/$test_name \ >>$tmp.arglist diff --git a/common/btrfs b/common/btrfs index bd2639bf..d27d3384 100644 --- a/common/btrfs +++ b/common/btrfs @@ -9,7 +9,7 @@ _btrfs_get_subvolid() mnt=$1 name=$2 - $BTRFS_UTIL_PROG sub list $mnt | egrep "\s$name$" | $AWK_PROG '{ print $2 }' + $BTRFS_UTIL_PROG sub list $mnt | grep -E "\s$name$" | $AWK_PROG '{ print $2 }' } # _require_btrfs_command [|