From patchwork Thu Nov 29 00:38:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Cheloha X-Patchwork-Id: 1004967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GF8NsBo6"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 434zFq5DDJz9s7T for ; Thu, 29 Nov 2018 11:40:31 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A2765AD8; Thu, 29 Nov 2018 00:38:39 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 54E609BA for ; Thu, 29 Nov 2018 00:38:38 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B848C19B for ; Thu, 29 Nov 2018 00:38:37 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id y78so87296qka.12 for ; Wed, 28 Nov 2018 16:38:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=9E7zprnt13QXfQYOjJRe7Qg7tcihvCCrTaIA+RyeeYo=; b=GF8NsBo6Y6Wj6phPrRTeJduK0SE0nKxYBUegwTYt0MKwmgC03h3prDDdwRD0hkCsg6 CAkXGpGveJX2OhtzZBWVk5uCfdeh0YIsrjk4TxqK7FDm0Rk4UlNdBD6ve4bgZ8QE3c9G tfQsC1IMqEX5JgAHybFPFAMmDsqNdcEbhR/YEwWSbf94D3lZf+3JgP9A8yfLOLUbClOj zaHriLK1pDEzUg70hzKW7ylAhnuz4CvOHN+hnL3lTG6y9E6EKNINgJ83O0Rtop4Jq4oG OKgca/xXGc2jbte1R0SzxFoTVEzqi7SZiRHgYyt1dEOADQ1YnlHe7CD1KBm4Y1k0v7Ap NcsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=9E7zprnt13QXfQYOjJRe7Qg7tcihvCCrTaIA+RyeeYo=; b=bvWW1liJYqclFGQxVT+zvAAzmhXfpTNRmvMAlr1/iStr6TpcICWCW6j5tlJnsiWiV7 tfFB7CHAPnyVVBRWodab5Ckh4Qa7ZehD+gppQXCDu8R4Nvv/rNvU5glg5Z7u3DM3j+Z1 zSWYHQMSmqLbnrJxw+oCt6YWvziBOOFy7ydM0Kb4F9GiBIhKfLn1U3SAblKvYOro2WtO IFMhff0Zxp/3k11gu8JxPbIMHDJEZnvJgdA5PaGE8jrpqV5Qr56DT6htuqHYELlh3FzD Vzif5PMNFaY034mQ/Dkw4sTsvzG+x6dn9x4lRFsx+PVwHibC6wmgddofLvjTzZPBrOe+ sn4g== X-Gm-Message-State: AA+aEWZKMQin5CW2C+AFDEd5WaqzsSNZCEba8dEvCt28Ave2sHPpdqC1 MssX3XKGW7vHvJreAab0J11wGDym X-Google-Smtp-Source: AFSGD/Xm9XFbt/5u0gey8DmnYmV+BsDz++M22o+jDgeWn+0rTRwH2T7DZ/sYuWwDRfbnL4FLrEeaTg== X-Received: by 2002:a37:2f84:: with SMTP id v126mr35329888qkh.254.1543451916396; Wed, 28 Nov 2018 16:38:36 -0800 (PST) Received: from localhost ([76.224.107.160]) by smtp.gmail.com with ESMTPSA id u4sm96911qkk.51.2018.11.28.16.38.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Nov 2018 16:38:35 -0800 (PST) Date: Wed, 28 Nov 2018 18:38:03 -0600 From: Scott Cheloha To: dev@openvswitch.org Message-ID: <20181129003803.fzaoll73vodnw37z@rascal.austin.ibm.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20180716 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] tests: keep some datapath parsing tests from hanging X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org The arguments to sed(1) need to be on the same line in the shell script or it will just sit there awaiting input. Signed-off-by: Scott Cheloha --- This is my first submission so I'm not sure if I'm doing this correctly. tests/odp.at | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/odp.at b/tests/odp.at index 1cff727ae..05dc76dbf 100644 --- a/tests/odp.at +++ b/tests/odp.at @@ -83,13 +83,11 @@ sed 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt | s echo echo '# Valid forms with tunnel and ERSPAN v1 headers.' - sed - 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=1,idx=0x7),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt + sed 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=1,idx=0x7),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt echo echo '# Valid forms with tunnel and ERSPAN v2 headers.' - sed - 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=2,dir=0x1,hwid=0x7),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt + sed 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=2,dir=0x1,hwid=0x7),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt ) > odp-in.txt AT_CAPTURE_FILE([odp-in.txt]) @@ -186,13 +184,11 @@ sed -n 's/,frag=no),.*/,frag=later)/p' odp-base.txt echo echo '# Valid forms with tunnel and ERSPAN v1 headers.' - sed - 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=1/0,idx=0x7/0xf),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt + sed 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=1/0,idx=0x7/0xf),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt echo echo '# Valid forms with tunnel and ERSPAN v2 headers.' - sed - 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=2,dir=0x1,hwid=0x7/0xf),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt + sed 's/^/skb_priority(0),tunnel(tun_id=0xfedcba9876543210,src=10.0.0.1,dst=10.0.0.2,ttl=128,erspan(ver=2,dir=0x1,hwid=0x7/0xf),flags(df|key)),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt ) > odp.txt AT_CAPTURE_FILE([odp.txt]) AT_CHECK_UNQUOTED([ovstest test-odp parse-wc-keys < odp.txt], [0], [`cat odp.txt`