Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DBBDC433FE for ; Wed, 12 Oct 2022 15:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229894AbiJLPTS (ORCPT ); Wed, 12 Oct 2022 11:19:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229995AbiJLPS4 (ORCPT ); Wed, 12 Oct 2022 11:18:56 -0400 Received: from orbyte.nwl.cc (orbyte.nwl.cc [IPv6:2001:41d0:e:133a::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B46C3CA881 for ; Wed, 12 Oct 2022 08:18:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nwl.cc; s=mail2022; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=e76Ybym15aPdaCUQvxK5NZA8BgHWtQTbhMfDbNHziUk=; b=S8S77hYdgUgZqFLxKwSrATKROa j3I+IYPBae0Mtw/0+1/WVfa3gA+B2dB1DmtIirhkuwFFoaLuJLUA52FgHtTfpHvol+woVz77PtdIh UV5hpYr0AnL6iS9FDnkrchqsBiX1yxphDHgbDw1xs7/lcuFHxWzEQiM4hKm2kwHcTeEZdsghX64A4 qRdx7dEuYn0ZUgKbvo/CiotR3RddfhhWVUu/cxXfQupRsEf3pK+aJ4NK6sUpJdZFe2KVmS1GlDaKH miwUVz1bovHe1prWOIgHwvSE1/y7yw2UxQOOPDmqQWlADB8nwpRE/0zCoRK2dLZf9ia5nrUN/xqiJ KFFzC9ag==; Received: from localhost ([::1] helo=xic) by orbyte.nwl.cc with esmtp (Exim 4.94.2) (envelope-from ) id 1oidVL-0002pJ-Bs; Wed, 12 Oct 2022 17:18:43 +0200 From: Phil Sutter To: netfilter-devel@vger.kernel.org Cc: Jan Engelhardt , Pablo Neira Ayuso , Florian Westphal Subject: [iptables PATCH v2 04/12] tests: *.t: Fix expected output for simple calls Date: Wed, 12 Oct 2022 17:17:54 +0200 Message-Id: <20221012151802.11339-5-phil@nwl.cc> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221012151802.11339-1-phil@nwl.cc> References: <20221012151802.11339-1-phil@nwl.cc> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org These minimal extension uses print in more detailed form. Track this, the output is desired. Signed-off-by: Phil Sutter --- extensions/libebt_log.t | 2 +- extensions/libebt_nflog.t | 2 +- extensions/libip6t_REJECT.t | 2 +- extensions/libipt_REJECT.t | 2 +- extensions/libxt_NFQUEUE.t | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/libebt_log.t b/extensions/libebt_log.t index f7116c417b0ab..e6adbd3b44380 100644 --- a/extensions/libebt_log.t +++ b/extensions/libebt_log.t @@ -1,5 +1,5 @@ :INPUT,FORWARD,OUTPUT ---log;=;OK +--log;--log-level notice;OK --log-level crit;=;OK --log-level 1;--log-level alert;OK --log-level emerg --log-ip --log-arp --log-ip6;=;OK diff --git a/extensions/libebt_nflog.t b/extensions/libebt_nflog.t index f867df303fa95..e98d8f5fdb9d6 100644 --- a/extensions/libebt_nflog.t +++ b/extensions/libebt_nflog.t @@ -1,5 +1,5 @@ :INPUT,FORWARD,OUTPUT ---nflog;=;OK +--nflog;--nflog-group 1;OK --nflog-group 42;=;OK --nflog-range 42;--nflog-group 1 --nflog-range 42 -j CONTINUE;OK --nflog-threshold 100 --nflog-prefix foo;--nflog-prefix "foo" --nflog-group 1 --nflog-threshold 100 -j CONTINUE;OK diff --git a/extensions/libip6t_REJECT.t b/extensions/libip6t_REJECT.t index d2b337d7ebdeb..8294f0bb77b29 100644 --- a/extensions/libip6t_REJECT.t +++ b/extensions/libip6t_REJECT.t @@ -1,5 +1,5 @@ :INPUT,FORWARD,OUTPUT --j REJECT;=;OK +-j REJECT;-j REJECT --reject-with icmp6-port-unreachable;OK # manpage for IPv6 variant of REJECT does not show up for some reason? -j REJECT --reject-with icmp6-no-route;=;OK -j REJECT --reject-with icmp6-adm-prohibited;=;OK diff --git a/extensions/libipt_REJECT.t b/extensions/libipt_REJECT.t index 5b26b1076b5b2..3f69a72994955 100644 --- a/extensions/libipt_REJECT.t +++ b/extensions/libipt_REJECT.t @@ -1,5 +1,5 @@ :INPUT,FORWARD,OUTPUT --j REJECT;=;OK +-j REJECT;-j REJECT --reject-with icmp-port-unreachable;OK -j REJECT --reject-with icmp-net-unreachable;=;OK -j REJECT --reject-with icmp-host-unreachable;=;OK -j REJECT --reject-with icmp-port-unreachable;=;OK diff --git a/extensions/libxt_NFQUEUE.t b/extensions/libxt_NFQUEUE.t index 5a2df6e7d00d0..8fb2b760a13bc 100644 --- a/extensions/libxt_NFQUEUE.t +++ b/extensions/libxt_NFQUEUE.t @@ -1,5 +1,5 @@ :INPUT,FORWARD,OUTPUT --j NFQUEUE;=;OK +-j NFQUEUE;-j NFQUEUE --queue-num 0;OK -j NFQUEUE --queue-num 0;=;OK -j NFQUEUE --queue-num 65535;=;OK -j NFQUEUE --queue-num 65536;;FAIL -- 2.34.1