From d6d45150cab02055da7bd6ce612f2db53a07e3e8 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 15 May 2016 22:37:09 +0000 Subject: [PATCH] only run integration tests if libgnurl/libcurl was available --- src/integration-tests/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 8f818ddee..4e96ee173 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am @@ -28,8 +28,15 @@ endif if HAVE_MHD if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; +if HAVE_LIBGNURL TESTS = \ $(check_SCRIPTS) +else +if HAVE_LIBCURL +TESTS = \ + $(check_SCRIPTS) +endif +endif endif endif @@ -54,7 +61,7 @@ test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connec test_integration_disconnect.py: test_integration_disconnect.py.in Makefile $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py chmod +x test_integration_disconnect.py - + test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py chmod +x test_integration_disconnect_nat.py -- 2.25.1