[PATCH net-next v2 3/3] net/udpgso_bench.sh test fails on error

From: Fred Klassen
Date: Tue May 28 2019 - 14:50:51 EST


Ensure that failure on any individual test results in an overall
failure of the test script.

Signed-off-by: Fred Klassen <fklassen@xxxxxxxxxxx>
---
tools/testing/selftests/net/udpgso_bench.sh | 33 +++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)

diff --git a/tools/testing/selftests/net/udpgso_bench.sh b/tools/testing/selftests/net/udpgso_bench.sh
index 89c7de97b832..3a8543b14d3f 100755
--- a/tools/testing/selftests/net/udpgso_bench.sh
+++ b/tools/testing/selftests/net/udpgso_bench.sh
@@ -3,6 +3,10 @@
#
# Run a series of udpgso benchmarks

+GREEN='\033[0;92m'
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
wake_children() {
local -r jobs="$(jobs -p)"

@@ -29,59 +33,88 @@ run_in_netns() {

run_udp() {
local -r args=$@
+ local errors=0

echo "udp"
run_in_netns ${args}
+ errors=$(( $errors + $? ))

echo "udp gso"
run_in_netns ${args} -S 0
+ errors=$(( $errors + $? ))

echo "udp gso zerocopy"
run_in_netns ${args} -S 0 -z
+ errors=$(( $errors + $? ))

echo "udp gso timestamp"
run_in_netns ${args} -S 0 -T
+ errors=$(( $errors + $? ))

echo "udp gso zerocopy audit"
run_in_netns ${args} -S 0 -z -a
+ errors=$(( $errors + $? ))

echo "udp gso timestamp audit"
run_in_netns ${args} -S 0 -T -a
+ errors=$(( $errors + $? ))

echo "udp gso zerocopy timestamp audit"
run_in_netns ${args} -S 0 -T -z -a
+ errors=$(( $errors + $? ))
+
+ return $errors
}

run_tcp() {
local -r args=$@
+ local errors=0

echo "tcp"
run_in_netns ${args} -t
+ errors=$(( $errors + $? ))

echo "tcp zerocopy"
run_in_netns ${args} -t -z
+ errors=$(( $errors + $? ))

# excluding for now because test fails intermittently
#echo "tcp zerocopy audit"
#run_in_netns ${args} -t -z -P -a
+ #errors=$(( $errors + $? ))
+
+ return $errors
}

run_all() {
local -r core_args="-l 3"
local -r ipv4_args="${core_args} -4 -D 127.0.0.1"
local -r ipv6_args="${core_args} -6 -D ::1"
+ local errors=0

echo "ipv4"
run_tcp "${ipv4_args}"
+ errors=$(( $errors + $? ))
run_udp "${ipv4_args}"
+ errors=$(( $errors + $? ))

echo "ipv6"
run_tcp "${ipv4_args}"
+ errors=$(( $errors + $? ))
run_udp "${ipv6_args}"
+ errors=$(( $errors + $? ))
+
+ return $errors
}

if [[ $# -eq 0 ]]; then
run_all
+ if [ $? -ne 0 ]; then
+ echo -e "$(basename $0): ${RED}FAIL${NC}"
+ exit 1
+ fi
+
+ echo -e "$(basename $0): ${GREEN}PASS${NC}"
elif [[ $1 == "__subprocess" ]]; then
shift
run_one $@
--
2.11.0