]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
t_client.sh: ignore fields from "ip -6 route show" output that distort results.
authorGert Doering <gert@greenie.muc.de>
Sun, 24 Nov 2013 16:13:04 +0000 (17:13 +0100)
committerGert Doering <gert@greenie.muc.de>
Sun, 24 Nov 2013 18:52:33 +0000 (19:52 +0100)
"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

tests/t_client.sh.in

index 9b83e148db52eb1a19bc689fae1bff784d7a32c4..6c9de6c337104f5032fb8af0891217f5d8e7f846 100755 (executable)
@@ -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