From: Florian Westphal <fw@strlen.de>
Date: Tue, 10 Jul 2018 10:58:24 +0000 (+0200)
Subject: tests: check iptables retval, not echo
X-Git-Tag: v1.8.1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c468f01f10f3f5d968bf894aa5f63c1113db3b7a;p=thirdparty%2Fiptables.git

tests: check iptables retval, not echo

Pablo reports that tests that should return nozero now fail.
Reason is that $? is checking return value of "echo" and not the script.

Fixes: 17c66a50608 ("iptables: tests: shell: Add README")
Reported-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/iptables/tests/shell/run-tests.sh b/iptables/tests/shell/run-tests.sh
index a39aecb6..b6eb01c6 100755
--- a/iptables/tests/shell/run-tests.sh
+++ b/iptables/tests/shell/run-tests.sh
@@ -65,13 +65,13 @@ do_test() {
 
 	if [ "$VERBOSE" = "y" ]; then
 		XT_MULTI=$xtables_multi unshare -n ${testfile}
+		rc_got=$?
 	else
 		XT_MULTI=$xtables_multi unshare -n ${testfile} > /dev/null 2>&1
+		rc_got=$?
 		echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line
 	fi
 
-	rc_got=$?
-
 	if [ "$rc_got" == "$rc_spec" ] ; then
 		msg_info "[OK]          $testfile"
 		((ok++))