X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2FMakefile.am;h=6fff0b407b817807b88df6a27b8dce1312bf96f2;hb=f7ef810b99d2c47d5a07739ecb0be1667f32567f;hp=2bb97770c1bb45cf5acaa5d7e0bbd5bea51ac15a;hpb=f57cbab24fb7a22fc982eb8b6c4a2d18402be460;p=oweals%2Fgnunet.git diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 2bb97770c..6fff0b407 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am @@ -1,3 +1,4 @@ +# This Makefile.am is in the public domain AM_CPPFLAGS = -I$(top_srcdir)/src/include if MINGW @@ -26,9 +27,16 @@ endif if HAVE_MHD if ENABLE_TEST_RUN -TESTS_ENVIRONMENT=export GNUNET_PREFIX=@libdir@;export PATH=@prefix@/bin:$$PATH; +AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; +if HAVE_LIBGNURL TESTS = \ $(check_SCRIPTS) +else +if HAVE_LIBCURL +TESTS = \ + $(check_SCRIPTS) +endif +endif endif endif @@ -53,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