summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2012-05-27 23:19:11 +0300
committerDavid Sommerseth <davids@redhat.com>2012-06-01 12:30:46 +0200
commit47c990009c79fe2a96206c54e0240cb2dd8cdf02 (patch)
tree1ec74d2dfe6b019de37b12437a7c7c2c8089792a /tests/Makefile.am
parent4f6f17767d91df264b9ab26526dc018a23e9f040 (diff)
downloadopenvpn-47c990009c79fe2a96206c54e0240cb2dd8cdf02.tar.gz
openvpn-47c990009c79fe2a96206c54e0240cb2dd8cdf02.tar.xz
openvpn-47c990009c79fe2a96206c54e0240cb2dd8cdf02.zip
repair t_client.sh test after build system revolution
- run t_client.sh at "make check" time - in t_client.sh, read t_client.rc from source *or* build dir (as before) - @IP@ evaluates to "" now (not "ip") if iproute2 not found - adapt script - introduce $SETUP_TIME_WAIT to delay "waiting for openvpn startup" longer than the default delay of 10 seconds - this is needed for test servers with a high network RTT Signed-off-by: Gert Doering <gert@greenie.muc.de> Acked-by: David Sommerseth <davids@redhat.com> Message-Id: 20120527202737.GV1161@greenie.muc.de URL: http://article.gmane.org/gmane.network.openvpn.devel/6616 Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ae845b..b7980e0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,13 +12,12 @@
MAINTAINERCLEANFILES = \
$(srcdir)/Makefile.in
-test_scripts = t_lpback.sh t_cltsrv.sh
+test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh
TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)"
TESTS = $(test_scripts)
dist_noinst_SCRIPTS = \
$(test_scripts) \
- t_cltsrv-down.sh \
- t_client.sh
+ t_cltsrv-down.sh