skip t_lpback.sh and t_cltsrv.sh if openvpn configured --disable-crypto
PATCH 1/1 skip t_lpback.sh and t_cltsrv.sh if openvpn configured --disable-crypto
--- configure.ac | 1 + tests/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
configure.ac +1 -0
@@ -1192,6 +1192,7 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) +AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) plugindir="${with_plugindir}" sampledir="\$(docdir)/sample"
tests/Makefile.am +4 -1
@@ -14,7 +14,10 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests -test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh +test_scripts = t_client.sh +if ENABLE_CRYPTO +test_scripts += t_lpback.sh t_cltsrv.sh +endif TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)
Signature · 1 line
2.5.5
Quoted 34 lines · Ilya Shipitsin
--- configure.ac | 1 + tests/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)configure.ac +1
-0@@ -1192,6 +1192,7 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) +AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) plugindir="${with_plugindir}" sampledir="\$(docdir)/sample"tests/Makefile.am +4
-2@@ -14,7 +14,10 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests -test_scripts = t_client.sh t_lpback.sh t_cltsrv.sh +test_scripts = t_client.sh +if ENABLE_CRYPTO +test_scripts += t_lpback.sh t_cltsrv.sh +endif TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts) --
Quoted 1 line
2.5.5
This patch was originally discussed on github:
https://github.com/OpenVPN/openvpn/pull/55.
Even though it would be more elegant to have 'make test' print a 'skipped', instead of just not running the test at all, that is very
minor and this clearly fixes an issue. So, ACK.
-Steffan
Your patch has been applied to the following branches
commit a85ba0e06badf9932e80deb53b68f50611943c6e (master) commit 8e13e38aef5028e2227eb2d5e0a7e35ba6ff028e (release/2.3)
Author: Ilya Shipitsin Date: Sat Sep 17 14:33:09 2016 +0500
skip t_lpback.sh and t_cltsrv.sh if openvpn configured --disable-crypto
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: http://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering