X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2FMakefile.am;h=2a106d3818c5ce5d6aed05904205e9b11d579333;hb=f1ca38573f22205e28ac482efebe463696c9c2c7;hp=a40fa76e6a6d262ff82f3e01acdfe9b4c1773782;hpb=6884edf943572c2a23544813858edd92186214c3;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index a40fa76e6..2a106d381 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -1,7 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
 endif
 
 if USE_COVERAGE
@@ -9,26 +9,43 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-bin_PROGRAMS =
+noinst_SCRIPTS = \
+ gnunet_testing.py \
+ gnunet_pyexpect.py
 
-check_PROGRAMS =
-
-
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
- test_integration_bootstrap_and_connect.py \
- test_integration_disconnect.py \
- test_integration_clique.py
+  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
 endif
 
 
+if HAVE_MHD
 if ENABLE_TEST_RUN
+TESTS_ENVIRONMENT=export GNUNET_PREFIX=@prefix@;export PATH=@prefix@/bin:$$PATH;
 TESTS = \
- $(check_SCRIPTS)  
+ $(check_SCRIPTS)
+endif
 endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
+%.py: %.py.in Makefile
+	$(do_subst) < $(srcdir)/$< > $@
+	chmod +x $@
+
+gnunet_testing.py: gnunet_testing.py.in Makefile
+	$(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py
+	chmod +x gnunet_testing.py
+
+gnunet_pyexpect.py: gnunet_pyexpect.py.in Makefile
+	$(do_subst) < $(srcdir)/gnunet_pyexpect.py.in > gnunet_pyexpect.py
+	chmod +x gnunet_pyexpect.py
+
 test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connect.py.in Makefile
 	$(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py
 	chmod +x test_integration_bootstrap_and_connect.py
@@ -37,14 +54,43 @@ 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
+
+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_nat.py: test_integration_reconnect_nat.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_reconnect_nat.py.in > test_integration_reconnect_nat.py
+	chmod +x test_integration_reconnect_nat.py
+
 test_integration_clique.py: test_integration_clique.py.in Makefile
 	$(do_subst) < $(srcdir)/test_integration_clique.py.in > test_integration_clique.py
-	chmod +x test_integration_clique.py	
+	chmod +x test_integration_clique.py
+
 
 EXTRA_DIST = \
+   gnunet_testing.py.in \
+   gnunet_pyexpect.py.in \
    test_integration_bootstrap_and_connect.py.in \
-   test_integration_disconnect.py.in \ 
-   test_integration_clique.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 \
+   confs/test_defaults.conf \
+   confs/c_bootstrap_server.conf \
+   confs/c_nat_client.conf \
+   confs/c_no_nat_client_2.conf \
+   confs/c_no_nat_client.conf \
+   hostkeys/c_bootstrap_server \
+   hostkeys/c_no_nat_client \
+   hostkeys/c_no_nat_client_2 \
+   hostkeys/c_nat_client
 
-CLEANFILES = $(check_SCRIPTS)
+CLEANFILES = \
+	$(check_SCRIPTS) \
+	gnunet_pyexpect.py \
+	gnunet_testing.py