From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH 10/12] tests: Simplify explicit checks for command success
Date: Tue, 17 May 2022 14:36:12 +0200
Message-ID: <20220517123614.1892316-11-sbrivio@redhat.com>
In-Reply-To: <20220517123614.1892316-1-sbrivio@redhat.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1694451484634331684=="

--===============1694451484634331684==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

From: David Gibson <david(a)gibson.dropbear.id.au>

A number of individual test cases use '*out' commands to check for success
of specific commands they've issued.  Now that the test harness is testing
for success of all issued commands as a matter of course, we no longer need
to do this.

Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
 test/build/static_checkers |  6 ++----
 test/distro/debian         | 33 +++++++++++----------------------
 test/distro/opensuse       | 18 ++++++------------
 test/distro/ubuntu         | 15 +++++----------
 test/icmp/passt_in_ns      |  4 ----
 5 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/test/build/static_checkers b/test/build/static_checkers
index d18dea8..34c8dff 100644
--- a/test/build/static_checkers
+++ b/test/build/static_checkers
@@ -14,9 +14,7 @@
 htools	clang-tidy cppcheck
=20
 test	Run clang-tidy
-hout	RET make clang-tidy; echo $?
-check	[ __RET__ -eq 0 ]
+host	make clang-tidy
=20
 test	Run cppcheck
-hout	RET make cppcheck; echo $?
-check	[ __RET__ -eq 0 ]
+host	make cppcheck
diff --git a/test/distro/debian b/test/distro/debian
index 344f453..f748dea 100644
--- a/test/distro/debian
+++ b/test/distro/debian
@@ -61,8 +61,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-=
type-limits" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-type=
-limits" make
=20
 # TODO: pasta test skipped for the moment: clone() as called by NS_CALL hangs
 # with wrapper provided by glibc 2.19, probably wrong argument order.
@@ -89,8 +88,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 host	sysctl -w kernel.unprivileged_userns_clone=3D1
 distro_quick_pasta_test
@@ -114,8 +112,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 host	sysctl -w kernel.unprivileged_userns_clone=3D1
 distro_quick_pasta_test
@@ -146,8 +143,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 host	sysctl -w kernel.unprivileged_userns_clone=3D1
 distro_quick_pasta_test
@@ -179,8 +175,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 host	sysctl -w kernel.unprivileged_userns_clone=3D1
 distro_quick_pasta_test
@@ -204,8 +199,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -234,8 +228,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -265,8 +258,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -289,8 +281,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -311,8 +302,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -334,8 +324,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
diff --git a/test/distro/opensuse b/test/distro/opensuse
index a2c0944..39f059a 100644
--- a/test/distro/opensuse
+++ b/test/distro/opensuse
@@ -60,8 +60,7 @@ host	echo "DNSSERVERS=3D'__DNS6__'" | netconfig modify -s d=
ns_resolver -i eth0
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && b=
reak; done; echo
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -89,8 +88,7 @@ host	echo "DNSSERVERS=3D'__DNS6__'" | netconfig modify -s d=
ns_resolver -i eth0
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && b=
reak; done; echo
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -117,8 +115,7 @@ host	echo "DNSSERVERS=3D'__DNS6__'" | netconfig modify -s=
 dns_resolver -i eth0
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && b=
reak; done; echo
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -143,8 +140,7 @@ sleep	10
 host	zypper install -y gcc make netcat-openbsd; echo
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -172,8 +168,7 @@ sleep	10
 host	zypper install -y gcc make netcat-openbsd; echo
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -200,8 +195,7 @@ host	echo "DNSSERVERS=3D'__DNS6__'" | netconfig modify -s=
 dns_resolver -i ens2
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && b=
reak; done; echo
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
diff --git a/test/distro/ubuntu b/test/distro/ubuntu
index 781daab..3ce156d 100644
--- a/test/distro/ubuntu
+++ b/test/distro/ubuntu
@@ -62,8 +62,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-=
type-limits" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-type=
-limits" make
=20
 # TODO: pasta test skipped for the moment: clone() as called by NS_CALL hangs
 # with wrapper provided by glibc 2.19, probably wrong argument order.
@@ -96,8 +95,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-=
type-limits -Wno-sign-compare" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-type=
-limits -Wno-sign-compare" make
=20
 # TODO: pasta test skipped for the moment: clone() as called by NS_CALL hangs
 # with wrapper provided by glibc 2.19, probably wrong argument order.
@@ -127,8 +125,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-=
type-limits -Wno-sign-compare" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Wno-missing-field-initializers -Wno-missing-braces -Wno-type=
-limits -Wno-sign-compare" make
=20
 # TODO: pasta test skipped for the moment: clone() as called by NS_CALL hangs
 # with wrapper provided by glibc 2.19, probably wrong argument order.
@@ -160,8 +157,7 @@ host	dhclient
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 distro_quick_pasta_test
=20
@@ -195,8 +191,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
=20
 host	make clean
-hout	RET CFLAGS=3D"-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS=3D"-Werror" make
=20
 host	export SHELL=3D"/bin/dash"
 host	dash
diff --git a/test/icmp/passt_in_ns b/test/icmp/passt_in_ns
index be5be29..38a9a4f 100644
--- a/test/icmp/passt_in_ns
+++ b/test/icmp/passt_in_ns
@@ -24,14 +24,10 @@ test	ICMP echo: guest to ns
 nsout	IFNAME_NS ip -j li sh | jq -rM '.[] | select(.link_type =3D=3D "ether"=
).ifname'
 ns	ip addr add 192.0.2.1/32 dev __IFNAME_NS__
 guest	ping -c1 -w1 192.0.2.1
-gout	RET echo $?
 ns	ip addr del 192.0.2.1/32 dev __IFNAME_NS__
-check	[ __RET__ -eq 0 ]
=20
 test	ICMPv6 echo: guest to ns
 ns	ip addr add 2001:db8::1 dev __IFNAME_NS__ && sleep 2 # DAD
 gout	IFNAME ip -j li sh | jq -rM '.[] | select(.link_type =3D=3D "ether").if=
name'
 guest	ping -c1 -w1 2001:db8::1
-gout	RET echo $?
 ns	ip addr del 2001:db8::1 dev __IFNAME_NS__
-check	[ __RET__ -eq 0 ]
--=20
2.35.1


--===============1694451484634331684==--