X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2FMakefile.am;h=e42fb0c333bb75861dd04cf7f56df284700a2e70;hb=d0b4927e6ab7e8b9874dd7807055e77fb4c5163f;hp=91de4ae5b9f9c6d505258024d49cf6befd303ebc;hpb=b10b45c398e1da19723c368d6ddd3641e2a97a79;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 91de4ae5b..e42fb0c33 100644
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -9,54 +9,85 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-bin_PROGRAMS =
+#bin_PROGRAMS = \
+# connection_watchdog
 
-check_PROGRAMS =
+noinst_PROGRAMS = connection_watchdog
 
 noinst_SCRIPTS = \
- gnunet_testing.py
+ gnunet_testing.py \
+ gnunet_pyexpect.py \
+ test_integration_connection_values_tcp.py \
+ test_integration_connection_values_tcp_udp.py \
+ test_integration_connection_values_tcp_udp_http.py
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
  test_integration_bootstrap_and_connect.py \
- test_integration_disconnect.py \
+ test_integration_bootstrap_and_connect_and_disconnect.py \
+ test_integration_bootstrap_and_connect_and_disconnect_nat.py \
  test_integration_restart.py \
  test_integration_clique.py \
- test_integration_clique_nat.py
+ test_integration_clique_nat.py \
+ test_integration_connect_on_restart.py
 endif
+# test_integration_disconnect.py 
 
 
+if HAVE_MHD
 if ENABLE_TEST_RUN
 TESTS = \
  $(check_SCRIPTS)  
 endif
+endif
+
+connection_watchdog_SOURCE = \
+ connection_watchdog.c      
+connection_watchdog_LDADD = \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 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
 
+test_integration_bootstrap_and_connect_and_disconnect.py: test_integration_bootstrap_and_connect_and_disconnect.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect_and_disconnect.py.in > test_integration_bootstrap_and_connect_and_disconnect.py
+	chmod +x test_integration_bootstrap_and_connect_and_disconnect.py
+
+test_integration_bootstrap_and_connect_and_disconnect_nat.py: test_integration_bootstrap_and_connect_and_disconnect_nat.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in > test_integration_bootstrap_and_connect_and_disconnect_nat.py
+	chmod +x test_integration_bootstrap_and_connect_and_disconnect_nat.py
+
+
 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_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_restart.py: test_integration_restart.py.in Makefile
 	$(do_subst) < $(srcdir)/test_integration_restart.py.in > test_integration_restart.py
 	chmod +x test_integration_restart.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	
@@ -65,15 +96,62 @@ test_integration_clique_nat.py: test_integration_clique_nat.py.in Makefile
 	$(do_subst) < $(srcdir)/test_integration_clique_nat.py.in > test_integration_clique_nat.py
 	chmod +x test_integration_clique_nat.py	
 
+test_integration_connect_on_restart.py: test_integration_connect_on_restart.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_connect_on_restart.py.in > test_integration_connect_on_restart.py
+	chmod +x test_integration_connect_on_restart.py		
+
+test_integration_connection_values_tcp.py: test_integration_connection_values_tcp.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_connection_values_tcp.py.in > test_integration_connection_values_tcp.py
+	chmod +x test_integration_connection_values_tcp.py		
+
+test_integration_connection_values_tcp_udp.py: test_integration_connection_values_tcp_udp.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp.py.in > test_integration_connection_values_tcp_udp.py
+	chmod +x test_integration_connection_values_tcp_udp.py		
+
+test_integration_connection_values_tcp_udp_http.py: test_integration_connection_values_tcp_udp_http.py.in Makefile
+	$(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp_http.py.in > test_integration_connection_values_tcp_udp_http.py
+	chmod +x test_integration_connection_values_tcp_udp_http.py		
+
 
 EXTRA_DIST = \
    gnunet_testing.py.in \
+   gnunet_pyexpect.py.in \
+   test_integration_connection_values_tcp.py.in \
+   test_integration_connection_values_tcp_udp.py.in \
+   test_integration_connection_values_tcp_udp_http.py.in \
    test_integration_bootstrap_and_connect.py.in \
+   test_integration_bootstrap_and_connect_and_disconnect.py.in \
+   test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \
+   test_integration_connect_on_restart.py.in \
    test_integration_disconnect.py.in \
-   test_integration_disconnect_nat.py \
-   test_integration_restart.py.in \ 
+   test_integration_restart.py.in \
    test_integration_clique.py.in \
-   test_integration_clique_nat.py.in
+   test_integration_clique_nat.py.in \
+   confs/c_bootstrap_server.conf \
+   confs/c_bootstrap_server_w_massif.conf \
+   confs/c_nat_client.conf \
+   confs/c_no_nat_client_2.conf \
+   confs/c_no_nat_client.conf \
+   confs/c_normal_client_tcp.conf \
+   confs/c_normal_client_tcp_udp.conf \
+   confs/c_normal_client_tcp_udp_http.conf \
+   confs/c_no_nat_client_http.conf \
+   confs/c_no_nat_client_http_2.conf\
+   confs/c_no_nat_client_http.conf \
+   confs/c_no_nat_client_http_2.conf \
+   confs/c_no_nat_client_unix.conf \
+   confs/c_no_nat_client_unix_2.conf \
+   hostkeys/0000-hostkey \
+   hostkeys/0001-hostkey \
+   hostkeys/0002-hostkey \
+   hostkeys/0003-hostkey \
+   hostkeys/0004-hostkey \
+   hostkeys/0005-hostkey \
+   hostkeys/0006-hostkey \
+   hostkeys/0007-hostkey \
+   hostkeys/0008-hostkey \
+   hostkeys/0009-hostkey 
+#   test_integration_disconnect_nat.py 
 
 CLEANFILES = \
 	$(check_SCRIPTS) \