projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix include
[oweals/gnunet.git]
/
src
/
integration-tests
/
Makefile.am
diff --git
a/src/integration-tests/Makefile.am
b/src/integration-tests/Makefile.am
index c1bbc72ec000d3d335fa9fc7b6c82ef5487e2022..6fff0b407b817807b88df6a27b8dce1312bf96f2 100644
(file)
--- 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
AM_CPPFLAGS = -I$(top_srcdir)/src/include
if MINGW
@@
-17,6
+18,7
@@
if HAVE_PYTHON
check_SCRIPTS = \
test_integration_bootstrap_and_connect.py \
test_integration_disconnect.py \
check_SCRIPTS = \
test_integration_bootstrap_and_connect.py \
test_integration_disconnect.py \
+ test_integration_disconnect_nat.py \
test_integration_reconnect.py \
test_integration_reconnect_nat.py \
test_integration_clique.py
test_integration_reconnect.py \
test_integration_reconnect_nat.py \
test_integration_clique.py
@@
-25,8
+27,16
@@
endif
if HAVE_MHD
if ENABLE_TEST_RUN
if HAVE_MHD
if ENABLE_TEST_RUN
+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)
TESTS = \
$(check_SCRIPTS)
+else
+if HAVE_LIBCURL
+TESTS = \
+ $(check_SCRIPTS)
+endif
+endif
endif
endif
endif
endif
@@
-52,6
+62,10
@@
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
$(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
+
test_integration_reconnect.py: test_integration_reconnect.py.in Makefile
$(do_subst) < $(srcdir)/test_integration_reconnect.py.in > test_integration_reconnect.py
chmod +x test_integration_reconnect.py
test_integration_reconnect.py: test_integration_reconnect.py.in Makefile
$(do_subst) < $(srcdir)/test_integration_reconnect.py.in > test_integration_reconnect.py
chmod +x test_integration_reconnect.py
@@
-70,6
+84,7
@@
EXTRA_DIST = \
gnunet_pyexpect.py.in \
test_integration_bootstrap_and_connect.py.in \
test_integration_disconnect.py.in \
gnunet_pyexpect.py.in \
test_integration_bootstrap_and_connect.py.in \
test_integration_disconnect.py.in \
+ test_integration_disconnect_nat.py.in \
test_integration_reconnect.py.in \
test_integration_reconnect_nat.py.in \
test_integration_clique.py.in \
test_integration_reconnect.py.in \
test_integration_reconnect_nat.py.in \
test_integration_clique.py.in \