tests: Simplify explicit checks for command success

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@gibson.dropbear.id.au>

3 files changed, 22 insertions, 44 deletions

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
 
 host	make clean
-hout	RET CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits" make
 
 # 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
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 host	sysctl -w kernel.unprivileged_userns_clone=1
 distro_quick_pasta_test
@@ -114,8 +112,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 host	sysctl -w kernel.unprivileged_userns_clone=1
 distro_quick_pasta_test
@@ -146,8 +143,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 host	sysctl -w kernel.unprivileged_userns_clone=1
 distro_quick_pasta_test
@@ -179,8 +175,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 host	sysctl -w kernel.unprivileged_userns_clone=1
 distro_quick_pasta_test
@@ -204,8 +199,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -234,8 +228,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -265,8 +258,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -289,8 +281,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -311,8 +302,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -334,8 +324,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
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='__DNS6__'" | netconfig modify -s dns_resolver -i eth0
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && break; done; echo
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -89,8 +88,7 @@ host	echo "DNSSERVERS='__DNS6__'" | netconfig modify -s dns_resolver -i eth0
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && break; done; echo
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -117,8 +115,7 @@ host	echo "DNSSERVERS='__DNS6__'" | netconfig modify -s dns_resolver -i eth0
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && break; done; echo
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -143,8 +140,7 @@ sleep	10
 host	zypper install -y gcc make netcat-openbsd; echo
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -172,8 +168,7 @@ sleep	10
 host	zypper install -y gcc make netcat-openbsd; echo
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -200,8 +195,7 @@ host	echo "DNSSERVERS='__DNS6__'" | netconfig modify -s dns_resolver -i ens2
 host	for i in $(seq 1 10); do zypper install -y gcc make netcat-openbsd && break; done; echo
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
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
 
 host	make clean
-hout	RET CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits" make
 
 # 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
 
 host	make clean
-hout	RET CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits -Wno-sign-compare" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits -Wno-sign-compare" make
 
 # 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
 
 host	make clean
-hout	RET CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits -Wno-sign-compare" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Wno-missing-field-initializers -Wno-missing-braces -Wno-type-limits -Wno-sign-compare" make
 
 # 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
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 distro_quick_pasta_test
 
@@ -195,8 +191,7 @@ host	apt-get update
 host	apt-get -y install make gcc netcat-openbsd
 
 host	make clean
-hout	RET CFLAGS="-Werror" make; echo $?
-check	[ __RET__ -eq 0 ]
+host	CFLAGS="-Werror" make
 
 host	export SHELL="/bin/dash"
 host	dash