summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2013-11-24 17:13:04 +0100
committerGert Doering <gert@greenie.muc.de>2013-11-24 19:54:50 +0100
commit8a553107046b5f214f869f936ba198535571e941 (patch)
tree827f2b3e1bb33593f9c94278c94c59e0f55373aa /tests
parent816ccf2666a2de6b7098c4b28d931ea378c278ea (diff)
downloadopenvpn-8a553107046b5f214f869f936ba198535571e941.tar.gz
openvpn-8a553107046b5f214f869f936ba198535571e941.tar.xz
openvpn-8a553107046b5f214f869f936ba198535571e941.zip
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 <gert@greenie.muc.de> Acked-by: Arne Schwabe <arne@rfc2549.org> Message-Id: <1385309584-23209-1-git-send-email-gert@greenie.muc.de> URL: http://article.gmane.org/gmane.network.openvpn.devel/8047 (cherry picked from commit 8c19087034cb1076874075b9e2896ea3f7be59cf)
Diffstat (limited to 'tests')
-rwxr-xr-xtests/t_client.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index 189eecc..64bb5fd 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -91,7 +91,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