diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-05-15 22:37:09 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-05-15 22:37:09 +0000 |
commit | d6d45150cab02055da7bd6ce612f2db53a07e3e8 (patch) | |
tree | 041af3037c37e3677f5e4ed268c9fd20ee458e60 /src/integration-tests/Makefile.am | |
parent | 6a4a7af5301434a5083f9904a4fe12766fef5fcf (diff) | |
download | gnunet-d6d45150cab02055da7bd6ce612f2db53a07e3e8.tar.gz gnunet-d6d45150cab02055da7bd6ce612f2db53a07e3e8.zip |
only run integration tests if libgnurl/libcurl was available
Diffstat (limited to 'src/integration-tests/Makefile.am')
-rw-r--r-- | src/integration-tests/Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
28 | if HAVE_MHD | 28 | if HAVE_MHD |
29 | if ENABLE_TEST_RUN | 29 | if ENABLE_TEST_RUN |
30 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | 30 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; |
31 | if HAVE_LIBGNURL | ||
31 | TESTS = \ | 32 | TESTS = \ |
32 | $(check_SCRIPTS) | 33 | $(check_SCRIPTS) |
34 | else | ||
35 | if HAVE_LIBCURL | ||
36 | TESTS = \ | ||
37 | $(check_SCRIPTS) | ||
38 | endif | ||
39 | endif | ||
33 | endif | 40 | endif |
34 | endif | 41 | endif |
35 | 42 | ||
@@ -54,7 +61,7 @@ test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connec | |||
54 | test_integration_disconnect.py: test_integration_disconnect.py.in Makefile | 61 | test_integration_disconnect.py: test_integration_disconnect.py.in Makefile |
55 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py | 62 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py |
56 | chmod +x test_integration_disconnect.py | 63 | chmod +x test_integration_disconnect.py |
57 | 64 | ||
58 | test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile | 65 | test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile |
59 | $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py | 66 | $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py |
60 | chmod +x test_integration_disconnect_nat.py | 67 | chmod +x test_integration_disconnect_nat.py |