-indentation, code cleanup

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

diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am
index 68dc5a63ff42186ed29651a2ce3e2d0afd1ad71b..e28e5446995d44ef89dac015990e16d7c940b2a9 100644 (file)
--- a/src/integration-tests/Makefile.am
+++ b/src/integration-tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if MINGW
  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
@@ -12,8 +12,6 @@ endif
 #bin_PROGRAMS = \
 # connection_watchdog
 
-check_PROGRAMS =
-
 noinst_PROGRAMS = connection_watchdog
 
 noinst_SCRIPTS = \
@@ -23,7 +21,7 @@ noinst_SCRIPTS = \
  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_bootstrap_and_connect_and_disconnect.py \
@@ -35,11 +33,12 @@ check_SCRIPTS = \
 endif
 # test_integration_disconnect.py 
 
-
+if HAVE_MHD
 if ENABLE_TEST_RUN
 TESTS = \
  $(check_SCRIPTS)  
 endif
+endif
 
 connection_watchdog_SOURCE = \
  connection_watchdog.c      
@@ -95,7 +94,7 @@ test_integration_clique.py: test_integration_clique.py.in Makefile
 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         
@@ -116,8 +115,9 @@ test_integration_connection_values_tcp_udp_http.py: test_integration_connection_
 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_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 \
@@ -126,6 +126,7 @@ EXTRA_DIST = \
    test_integration_restart.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 \
@@ -133,10 +134,16 @@ EXTRA_DIST = \
    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 \
+   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 \