- revert plugin move. Add new identity-token

[oweals/gnunet.git] / src / integration-tests / Makefile.am

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 91de4ae5b9f9c6d505258024d49cf6befd303ebc..8f818ddee0788a3615066d43e14c3046fb56355c 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -1,7 +1,8 @@
-INCLUDES = -I$(top_srcdir)/src/include
+# This Makefile.am is in the public domain
+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 +10,27 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-bin_PROGRAMS =
-
-check_PROGRAMS =
-
 noinst_SCRIPTS = \
- gnunet_testing.py
+ gnunet_testing.py \
+ gnunet_pyexpect.py
 
-if HAVE_PYTHON_PEXPECT
+if HAVE_PYTHON
 check_SCRIPTS = \
- test_integration_bootstrap_and_connect.py \
- test_integration_disconnect.py \
- test_integration_restart.py \
- test_integration_clique.py \
- test_integration_clique_nat.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
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
 TESTS = \
- $(check_SCRIPTS)  
+ $(check_SCRIPTS)
+endif
 endif
 
 do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
@@ -36,10 +38,14 @@ 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      
+       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
@@ -48,33 +54,44 @@ test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connec
 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_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.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     
-
-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 
+       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_disconnect_nat.py \
-   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 \
+   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