From 8c19087034cb1076874075b9e2896ea3f7be59cf Mon Sep 17 00:00:00 2001 From: Gert Doering Date: Sun, 24 Nov 2013 17:13:04 +0100 Subject: t_client.sh: ignore fields from "ip -6 route show" output that distort results. "ip -6 route show" prints stuff like "rtt 38ms rttvar 38ms cwnd 10", which sometimes changes while an OpenVPN test is running, resulting in spurious failures in the "ifconfig/route must be restored identically after OpenVPN ends" test in t_client.sh. Not all fields are there all the time, so use "sed" to get rid of whatever is printed this time. Only relevant for "make check" on linux builds with "--enable-iproute2". Signed-off-by: Gert Doering Acked-by: Arne Schwabe Message-Id: <1385309584-23209-1-git-send-email-gert@greenie.muc.de> URL: http://article.gmane.org/gmane.network.openvpn.devel/8047 --- tests/t_client.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in index 9b83e14..6c9de6c 100755 --- a/tests/t_client.sh.in +++ b/tests/t_client.sh.in @@ -103,7 +103,7 @@ get_ifconfig_route() echo "-- linux iproute2 --" @IPROUTE@ addr show | grep -v valid_lft @IPROUTE@ route show - @IPROUTE@ -o -6 route show | grep -v ' cache' | sed -e 's/expires [0-9]*sec//' + @IPROUTE@ -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g' return fi -- cgit