Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp1398454ybj; Thu, 7 May 2020 23:57:41 -0700 (PDT) X-Google-Smtp-Source: APiQypJNfl8W1WCHZ9QiLxDCImPZqBkmb9VYIZpAefIsPX9RMvCALX9Y598oZBWOAY/rTgqIhda6 X-Received: by 2002:a17:906:7fd7:: with SMTP id r23mr649919ejs.32.1588921060870; Thu, 07 May 2020 23:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588921060; cv=none; d=google.com; s=arc-20160816; b=tQeq8/BFiw38YWTswYMnroph6HFNh5feR1F2fxH8fRnofFZJNAmmAkIMrlY6t5u5Nf Odv8Ch0Nrlk5DpKBBmni0pBFPkqEpH4IIemouYdq1C6HdNRluJmchTGiYiKkwoqXpvIa E+FYrh8TfhZzXsmq+Bb07ZwkeSQyPLzj++rIN3ZLCIh/0fp/cXWokIpQf1uy2PxsRUhT 1JSPRf3kUr01d3mIIACyjUr/jaUhd8wExCgd3bqJE3YZ5uxTpCltdxeo6wVEc5Dds2Xm /zgUYYP+763T4N20knwj/BF4G9/XHV+9PQDwUbFA+DA4UfKhbO6tPAvtkAajzAeHa5Ix 5kKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5/aN67B0ICz1ZdohLOo/4BU8IKFJhb1hQbJxfm+swEc=; b=GDKIX0vHhZ5Bqjvr6X2loZ1kdL77+d1rdyhfc77Xr6LWQpX/s2+T2LF5+boMpUDxrj ibhvCeQA3PdMxqHKqxPNPLdObVtQtiQgN++S8qFEWYf8WJJyG2OU8BE3HNq+NypBpCXK c0qwQSAUbQ5onKwL543j9/KyVy5C68aW0PdIAq+qRx9aDCfB+M64Fc1W/YBBD7VmvJ7z TKAL+I7E3w8AJENedVr1ovmT4Pux+gIlfIgiYGI3ewalQBBRC5Wlau8ytr4up6yyCQFH Y3zr3FqgSO4awQ/CGNM71uoJuKVgda+dqWSA/jepRFIw/oYwAJcbzeZX9r5sJFgJy8zm OH6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=lBieyN44; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v21si410447eja.226.2020.05.07.23.57.17; Thu, 07 May 2020 23:57:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=lBieyN44; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726974AbgEHGxt (ORCPT + 99 others); Fri, 8 May 2020 02:53:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725971AbgEHGxs (ORCPT ); Fri, 8 May 2020 02:53:48 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38809C05BD43; Thu, 7 May 2020 23:53:48 -0700 (PDT) Received: by ozlabs.org (Postfix, from userid 1034) id 49JLdh6JfQz9sSy; Fri, 8 May 2020 16:53:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1588920824; bh=9Ynms6h27w3AbHNpPH8n4uEonv1y0P/FM3hzIpDmeh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lBieyN440rRpPXdGKZOP/FUv65pTIR2LQbC4+L21Xu6LA4zmzWIQafdUr6+jxSeiW l5m5McNHxwk5XIa9VtBvcx4dmDfD0zH0b8hNkXEp2ql0y+HcaISvLyNHR+lJb+8bRq IJl+jgMjI2qVUVFUiQUTz/ouKLyiCeMr9O3bEiZBfKGsxKcKp3tQXfPqfFuPVZXsQj MXK4NEVfsv/qDbYdI7o+J1iw2jpjgJUOrs4V0HcNJ6r6KCmmi85gVAiiJ6Aj/3R4EP V9wtD8tWLW6JeC6uV8EAiRVXYJXdSmITh0po6xMm/O73AXtX3HWCXA2ayzGF7V8sLL 6dfxqUlxwidog== From: Michael Ellerman To: keescook@chromium.org, linux-kselftest@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2/2] selftests/lkdtm: Use grep -E instead of egrep Date: Fri, 8 May 2020 16:53:56 +1000 Message-Id: <20200508065356.2493343-2-mpe@ellerman.id.au> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508065356.2493343-1-mpe@ellerman.id.au> References: <20200508065356.2493343-1-mpe@ellerman.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org shellcheck complains that egrep is deprecated, and the grep man page agrees. Use grep -E instead. Signed-off-by: Michael Ellerman --- tools/testing/selftests/lkdtm/run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh index 0b409e187c7b..ee64ff8df8f4 100755 --- a/tools/testing/selftests/lkdtm/run.sh +++ b/tools/testing/selftests/lkdtm/run.sh @@ -25,13 +25,13 @@ fi # Figure out which test to run from our script name. test=$(basename $0 .sh) # Look up details about the test from master list of LKDTM tests. -line=$(egrep '^#?'"$test"'\b' tests.txt) +line=$(grep -E '^#?'"$test"'\b' tests.txt) if [ -z "$line" ]; then echo "Skipped: missing test '$test' in tests.txt" exit $KSELFTEST_SKIP_TEST fi # Check that the test is known to LKDTM. -if ! egrep -q '^'"$test"'$' "$TRIGGER" ; then +if ! grep -E -q '^'"$test"'$' "$TRIGGER" ; then echo "Skipped: test '$test' missing in $TRIGGER!" exit $KSELFTEST_SKIP_TEST fi @@ -80,11 +80,11 @@ dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$DMESG" - cat "$LOG" # Check for expected output -if egrep -qi "$expect" "$LOG" ; then +if grep -E -qi "$expect" "$LOG" ; then echo "$test: saw '$expect': ok" exit 0 else - if egrep -qi XFAIL: "$LOG" ; then + if grep -E -qi XFAIL: "$LOG" ; then echo "$test: saw 'XFAIL': [SKIP]" exit $KSELFTEST_SKIP_TEST else -- 2.25.1