X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fintegration-tests%2FMakefile.am;h=6fff0b407b817807b88df6a27b8dce1312bf96f2;hb=f7ef810b99d2c47d5a07739ecb0be1667f32567f;hp=de579c93965b4f92b62bda758114d0f2bb0691a4;hpb=62462d8259893dd3b3962d5ef39d04d7fc3d7a3e;p=oweals%2Fgnunet.git

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index de579c939..6fff0b407 100644
--- 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
@@ -15,22 +16,29 @@ noinst_SCRIPTS = \
 
 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
+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)
+else
+if HAVE_LIBCURL
 TESTS = \
  $(check_SCRIPTS)
 endif
 endif
+endif
+endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
 
@@ -46,80 +54,49 @@ 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_andconnect.py: test_integration_bootstrap_and_connect.py.in Makefile
+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
-
 
 EXTRA_DIST = \
    gnunet_testing.py.in \
    gnunet_pyexpect.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 \
-   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/c_bootstrap_server \
    hostkeys/c_no_nat_client \
    hostkeys/c_no_nat_client_2 \
-   hostkeys/c_nat_client \
-   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_nat_client
 
 CLEANFILES = \
 	$(check_SCRIPTS) \