On 17 September 2016 at 11:33, Ilya Shipitsin <chipits...@gmail.com> wrote:
> ---
> configure.ac | 1 +
> tests/Makefile.am | 5 ++++-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index d733023..dc95123 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -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"
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 2cba9e6..235cd13 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -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)
> --
> 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
------------------------------------------------------------------------------
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
