From: Fred Klassen <fklassen@appneta.com>
To: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Willem de Bruijn <willemb@google.com>
Cc: Fred Klassen <fklassen@appneta.com>
Subject: [PATCH net-next v3 3/3] net/udpgso_bench.sh test fails on error
Date: Mon, 17 Jun 2019 12:08:37 -0700 [thread overview]
Message-ID: <20190617190837.13186-4-fklassen@appneta.com> (raw)
In-Reply-To: <20190617190837.13186-1-fklassen@appneta.com>
Ensure that failure on any individual test results in an overall
failure of the test script.
Signed-off-by: Fred Klassen <fklassen@appneta.com>
---
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 d4d831dfd44d..4df1cd8d69d2 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,60 +33,89 @@ 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
# add -P option to include poll() to reduce possibility of lost messages
#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
next prev parent reply other threads:[~2019-06-17 19:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 19:08 [PATCH net-next v3 0/3] UDP GSO audit tests Fred Klassen
2019-06-17 19:08 ` [PATCH net-next v3 1/3] net/udpgso_bench_tx: options to exercise TX CMSG Fred Klassen
2019-06-17 19:08 ` [PATCH net-next v3 2/3] net/udpgso_bench.sh add UDP GSO audit tests Fred Klassen
2019-06-17 19:08 ` Fred Klassen [this message]
2019-06-17 20:29 ` [PATCH net-next v3 0/3] " Willem de Bruijn
2019-06-17 23:30 ` David Miller
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=20190617190837.13186-4-fklassen@appneta.com \
--to=fklassen@appneta.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
/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).