From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH 4/4] tests/shell: Print unified diffs in dump errors
Date: Fri, 7 Jun 2019 19:25:27 +0200 [thread overview]
Message-ID: <20190607172527.22177-5-phil@nwl.cc> (raw)
In-Reply-To: <20190607172527.22177-1-phil@nwl.cc>
Non-unified format is useful only if the expected output is printed as
well, which is not the case.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
tests/shell/run-tests.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh
index 81ee0cdd62f4a..632cccee0af29 100755
--- a/tests/shell/run-tests.sh
+++ b/tests/shell/run-tests.sh
@@ -106,7 +106,7 @@ do
dumpfile="${dumppath}/$(basename ${testfile}).nft"
rc_spec=0
if [ "$rc_got" -eq 0 ] && [ -f ${dumpfile} ]; then
- test_output=$(${DIFF} ${dumpfile} <($NFT list ruleset) 2>&1)
+ test_output=$(${DIFF} -u ${dumpfile} <($NFT list ruleset) 2>&1)
rc_spec=$?
fi
--
2.21.0
next prev parent reply other threads:[~2019-06-07 17:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-07 17:25 [nft PATCH 0/4] Some fixes and minor improvements in tests/ Phil Sutter
2019-06-07 17:25 ` [nft PATCH 1/4] tests/py: Fix JSON equivalents Phil Sutter
2019-06-07 17:25 ` [nft PATCH 2/4] tests/py: Add missing arp.t " Phil Sutter
2019-06-07 17:25 ` [nft PATCH 3/4] tests/shell: Fix warning from awk call Phil Sutter
2019-06-07 17:25 ` Phil Sutter [this message]
2019-06-07 22:06 ` [nft PATCH 0/4] Some fixes and minor improvements in tests/ Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190607172527.22177-5-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).