From 8e13e38aef5028e2227eb2d5e0a7e35ba6ff028e Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sat, 17 Sep 2016 14:33:09 +0500 Subject: [PATCH] skip t_lpback.sh and t_cltsrv.sh if openvpn configured --disable-crypto Acked-by: Steffan Karger Message-Id: <1474104789-31735-1-git-send-email-chipitsine@gmail.com> URL: http://www.mail-archive.com/search?l=mid&q=1474104789-31735-1-git-send-email-chipitsine@gmail.com Signed-off-by: Gert Doering (cherry picked from commit a85ba0e06badf9932e80deb53b68f50611943c6e) --- configure.ac | 1 + tests/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index faa496135..13cf65e2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,6 +1119,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 2cba9e66d..235cd1328 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.47.2