From patchwork Mon Oct 3 10:36:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1685501 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=O60LhBWe; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mgy1k54JTz23jL for ; Mon, 3 Oct 2022 21:36:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7F4D541507; Mon, 3 Oct 2022 10:36:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7F4D541507 Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=O60LhBWe X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Aiyoq5PedA_4; Mon, 3 Oct 2022 10:36:39 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4E7DF41506; Mon, 3 Oct 2022 10:36:38 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4E7DF41506 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2BC47C0032; Mon, 3 Oct 2022 10:36:38 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8C82CC002D for ; Mon, 3 Oct 2022 10:36:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 56A8641516 for ; Mon, 3 Oct 2022 10:36:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 56A8641516 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EDTrR8mNKtIG for ; Mon, 3 Oct 2022 10:36:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 50D8141519 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 50D8141519 for ; Mon, 3 Oct 2022 10:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664793394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ANZZ9ZPvKVJdH+BwiH6W55id/TZXJ1nP7olRifDJR/4=; b=O60LhBWewPwz2FCq2JwXOFigOp2WTdI2G9qBLLFSseQG9xi8byGADOT7n9uzrFLxi2qZ03 2NlFS265TT8KEiZsIRdET0zw9jhPuUc2tNxzf09teJBe0RLyN/AS+nnnHOts/e0XdwlPMi 4Ks6KDavVVjbJ//atwQPIIBa1MfV9vE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-1Gb5BJnLO56cPw4GDBvPAg-1; Mon, 03 Oct 2022 06:36:31 -0400 X-MC-Unique: 1Gb5BJnLO56cPw4GDBvPAg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EBBE0185A7A4; Mon, 3 Oct 2022 10:36:30 +0000 (UTC) Received: from dceara.remote.csb (unknown [10.39.194.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69ED72166B26; Mon, 3 Oct 2022 10:36:30 +0000 (UTC) From: Dumitru Ceara To: ovs-dev@openvswitch.org Date: Mon, 3 Oct 2022 12:36:28 +0200 Message-Id: <166479338598.310761.15892760832452456419.stgit@dceara.remote.csb> In-Reply-To: <166479337525.310761.1104428475550955568.stgit@dceara.remote.csb> References: <166479337525.310761.1104428475550955568.stgit@dceara.remote.csb> User-Agent: StGit/0.23 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org Subject: [ovs-dev] [PATCH ovn 1/2] tests: Use grep -E and grep -F instead of obsolete egrep/fgrep. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Inspired by Andreas Stieger's OVS commit 75c355adc057 ("tests: Fix tests with GNU grep 3.8."): https://github.com/openvswitch/ovs/commit/75c355adc057 Signed-off-by: Dumitru Ceara --- tests/ovn-nbctl.at | 2 +- tests/ovn.at | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 6a5d52a5da..4d480e3573 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -2276,7 +2276,7 @@ AT_CHECK([grep 'missing argument to .* option' stderr], [0], [ignore]) dnl Unexpected option argument AT_CHECK([ovn-nbctl --if-exists=foo list Logical_Switch], [1], [], [stderr]) -AT_CHECK([egrep 'option .* doesn'\''t allow an argument|option .* requires an argument' stderr], [0], [ignore]) +AT_CHECK([grep -E 'option .* doesn'\''t allow an argument|option .* requires an argument' stderr], [0], [ignore]) AT_CHECK([ovn-nbctl -- --if-exists=foo list Logical_Switch], [1], [], [stderr]) AT_CHECK([grep 'option on .* does not accept an argument' stderr], [0], [ignore]) diff --git a/tests/ovn.at b/tests/ovn.at index 0dc23dbd22..f8b8db4df8 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -6882,7 +6882,7 @@ ciaddr=`ip_to_hex 0 0 0 0` request_ip=0 expected_dhcp_opts="" test_dhcp 18 1 f00000000001 04 0 $ciaddr $offer_ip $request_ip 0 0 ff1000000001 $server_ip 02 $expected_dhcp_opts -AT_CHECK([fgrep -iq 'DHCPDECLINE from f0:00:00:00:00:01, 10.0.0.4 duplicated' hv1/ovn-controller.log], [0], []) +AT_CHECK([grep -F -iq 'DHCPDECLINE from f0:00:00:00:00:01, 10.0.0.4 duplicated' hv1/ovn-controller.log], [0], []) # Send Etherboot.