From patchwork Tue Jun 1 18:39:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1486204 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fvgtj2flkz9sRf for ; Wed, 2 Jun 2021 04:39:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 42C204029B; Tue, 1 Jun 2021 18:39:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IwjShpZb0FoI; Tue, 1 Jun 2021 18:39:38 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTP id 7A8EB40282; Tue, 1 Jun 2021 18:39:37 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4E86AC000D; Tue, 1 Jun 2021 18:39:37 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 75C22C0001 for ; Tue, 1 Jun 2021 18:39:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 56CFD4040F for ; Tue, 1 Jun 2021 18:39:35 +0000 (UTC) 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 6R6h2L2TJ-ZC for ; Tue, 1 Jun 2021 18:39:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2A32E403E3 for ; Tue, 1 Jun 2021 18:39:33 +0000 (UTC) Received: (Authenticated sender: blp@ovn.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 1E535FF802; Tue, 1 Jun 2021 18:39:29 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Tue, 1 Jun 2021 11:39:23 -0700 Message-Id: <20210601183923.3825864-1-blp@ovn.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH ovn] tests: Fix PKIDIR checks in AT_SKIP. 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" In Autotest, [xyz] just expands to xyz. To get [xyz] in output, we need [[xyz]] in input. I spotted this based on "expr" reporting an error in testsuite output. Signed-off-by: Ben Pfaff --- tests/ovn-controller.at | 4 ++-- tests/ovn-northd.at | 4 ++-- tests/ovn.at | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/ovn-controller.at b/tests/ovn-controller.at index cff08cb7b801..72c07b3faf54 100644 --- a/tests/ovn-controller.at +++ b/tests/ovn-controller.at @@ -554,8 +554,8 @@ AT_SETUP([ovn-controller - ssl files change when using command line options]) AT_KEYWORDS([ovn]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" -\\]"]) +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" +\\]]"]) ovn_start net_add n1 diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 8bd6e48ec495..818ff7a206b0 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -3553,8 +3553,8 @@ OVN_FOR_EACH_NORTHD([ AT_SETUP([ovn -- northd ssl file change]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" -\\]"]) +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" +\\]]"]) ovn_start --backup-northd=none as northd diff --git a/tests/ovn.at b/tests/ovn.at index a21dbadace1b..f26894ce4891 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -9009,8 +9009,8 @@ AT_CLEANUP AT_SETUP([ovn -- read-only sb db:pssl access]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" -\\]"]) +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" +\\]]"]) : > .$1.db.~lock~ ovsdb-tool create ovn-sb.db "$abs_top_srcdir"/ovn-sb.ovsschema @@ -9065,8 +9065,8 @@ AT_CLEANUP AT_SETUP([ovn -- nb connection/ssl commands]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" -\\]"]) +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" +\\]]"]) : > .$1.db.~lock~ ovsdb-tool create ovn-nb.db "$abs_top_srcdir"/ovn-nb.ovsschema @@ -9116,8 +9116,8 @@ AT_CLEANUP AT_SETUP([ovn -- sb connection/ssl commands]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) PKIDIR="$(cd $abs_top_builddir/tests && pwd)" -AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\" -\\]"]) +AT_SKIP_IF([expr "$PKIDIR" : ".*[[ '\" +\\]]"]) : > .$1.db.~lock~ ovsdb-tool create ovn-sb.db "$abs_top_srcdir"/ovn-sb.ovsschema