cron2 has submitted this change. (
http://gerrit.openvpn.net/c/openvpn/+/768?usp=email )
Change subject: t_client.sh: conditionally skip ifconfig+route check
......................................................................
t_client.sh: conditionally skip ifconfig+route check
For --dev null or --dev-type af_unix:lwipopenvn tests, there will be
no visible change to ifconfig or route output, so tests will fail
("how can this be?"). Set EXPECT_IFCONFIG4_<n>=- to skip this
check.
(Simply leaving both EXPECT_IFCONFIG* vars empty and using that as
trigger would interfere with the magic from commit df0b00c25)
v2: fix string-equal comparison
Change-Id: Iec1953415afb53755488dd44407568e72d28e854
Signed-off-by: Gert Doering <[email protected]>
Acked-by: Frank Lichtenheld <[email protected]>
Message-Id: <[email protected]>
URL:
https://www.mail-archive.com/[email protected]/msg29473.html
Signed-off-by: Gert Doering <[email protected]>
---
M tests/t_client.sh.in
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index f6654dd..1ccadeb 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -225,6 +225,7 @@
expect_list="$@"
if [ -z "$expect_list" ] ; then return ; fi
+ if [ "$expect_list" = "-" ] ; then return ; fi
for expect in $expect_list
do
@@ -404,13 +405,17 @@
output "save ifconfig+route"
get_ifconfig_route >$LOGDIR/$SUF:ifconfig_route.txt
- output -n "compare pre-openvpn ifconfig+route with current values..."
- if diff $LOGDIR/$SUF:ifconfig_route_pre.txt \
- $LOGDIR/$SUF:ifconfig_route.txt >/dev/null
- then
- fail "no differences between ifconfig/route before OpenVPN start and
now."
+ if [ "$expect_ifconfig4" = "-" ] ; then
+ output "skip ifconfig+route check"
else
- output " OK!\n"
+ output -n "compare pre-openvpn ifconfig+route with current values..."
+ if diff $LOGDIR/$SUF:ifconfig_route_pre.txt \
+ $LOGDIR/$SUF:ifconfig_route.txt >/dev/null
+ then
+ fail "no differences between ifconfig/route before OpenVPN start
and now."
+ else
+ output " OK!\n"
+ fi
fi
# post init script needed?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/768?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iec1953415afb53755488dd44407568e72d28e854
Gerrit-Change-Number: 768
Gerrit-PatchSet: 3
Gerrit-Owner: cron2 <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
