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

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 68dc5a63f..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,45 +9,28 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-#bin_PROGRAMS = \
-# connection_watchdog
-
-check_PROGRAMS =
-
-noinst_PROGRAMS = connection_watchdog
-
 noinst_SCRIPTS = \
  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
+ gnunet_pyexpect.py
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
- test_integration_bootstrap_and_connect.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_connect_on_restart.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
-# test_integration_disconnect.py 
 
 
+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
-
-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'
 
@@ -57,94 +40,57 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
 gnunet_testing.py: gnunet_testing.py.in Makefile
 	$(do_subst) < $(srcdir)/gnunet_testing.py.in > gnunet_testing.py
-	chmod +x 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	
+	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_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_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_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	
-
-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		
+	chmod +x test_integration_clique.py
 
 
 EXTRA_DIST = \
    gnunet_testing.py.in \
    gnunet_pyexpect.py.in \
-   test_integration_connection_value_tcp.py.in \
-   test_integration_connection_value_tcp_udp.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_restart.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_clique_nat.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 \
-   confs/c_normal_client_tcp.conf \
-   confs/c_normal_client_tcp_udp.conf \
-   confs/c_normal_client_tcp_udp_http.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 
+   hostkeys/c_bootstrap_server \
+   hostkeys/c_no_nat_client \
+   hostkeys/c_no_nat_client_2 \
+   hostkeys/c_nat_client
 
 CLEANFILES = \
 	$(check_SCRIPTS) \
+	gnunet_pyexpect.py \
 	gnunet_testing.py