From patchwork Fri Jan 4 18:51:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1020883 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43WYrp3c4vz9s55 for ; Sat, 5 Jan 2019 05:55:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726668AbfADSzi (ORCPT ); Fri, 4 Jan 2019 13:55:38 -0500 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:53662 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726529AbfADSzi (ORCPT ); Fri, 4 Jan 2019 13:55:38 -0500 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.89) (envelope-from ) id 1gfUd6-0003I8-7o; Fri, 04 Jan 2019 19:55:36 +0100 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH nft 3/4] tests: shell: fix up redefine test case Date: Fri, 4 Jan 2019 19:51:46 +0100 Message-Id: <20190104185147.29866-4-fw@strlen.de> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190104185147.29866-1-fw@strlen.de> References: <20190104185147.29866-1-fw@strlen.de> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The '$' has to be escaped, else it gets replaced with an empty value by the shell. As 'set -e' is used, that caused the first nft command to fail. Signed-off-by: Florian Westphal --- tests/shell/testcases/nft-f/0016redefines_1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/shell/testcases/nft-f/0016redefines_1 b/tests/shell/testcases/nft-f/0016redefines_1 index 9f6b56fef4bc..d0148d65da54 100755 --- a/tests/shell/testcases/nft-f/0016redefines_1 +++ b/tests/shell/testcases/nft-f/0016redefines_1 @@ -7,18 +7,18 @@ table ip x { chain y { define unused = 4.4.4.4 define address = { 1.1.1.1, 2.2.2.2 } - ip saddr $address + ip saddr \$address redefine address = { 3.3.3.3 } - ip saddr $address + ip saddr \$address undefine unused } }" EXPECTED="table ip x { - chain y { - ip saddr { 1.1.1.1, 2.2.2.2 } - ip saddr { 3.3.3.3 } - } + chain y { + ip saddr { 1.1.1.1, 2.2.2.2 } + ip saddr { 3.3.3.3 } + } }" $NFT -f - <<< "$RULESET"