-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 14649596d0a3082f5477feb8e36fb4433e576c78..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 
@@ -33,14 +33,12 @@ check_SCRIPTS = \
 endif
 # test_integration_disconnect.py 
 
-check_PROGRAMS = \
-       test_connection_stability
-
-
+if HAVE_MHD
 if ENABLE_TEST_RUN
 TESTS = \
  $(check_SCRIPTS)  
 endif
+endif
 
 connection_watchdog_SOURCE = \
  connection_watchdog.c      
@@ -113,12 +111,6 @@ test_integration_connection_values_tcp_udp_http.py: test_integration_connection_
        $(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             
 
-test_connection_stability_SOURCES = \
- test_connection_stability.c
-test_connection_stability_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
- $(top_builddir)/src/util/libgnunetutil.la  
-
 
 EXTRA_DIST = \
    gnunet_testing.py.in \
@@ -134,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 \
@@ -147,11 +140,10 @@ EXTRA_DIST = \
    confs/c_no_nat_client_http_2.conf \
    confs/c_no_nat_client_unix.conf \
    confs/c_no_nat_client_unix_2.conf \
-   test_connection_stability.conf \
-   hostkeys/0000-hostkey \
-   hostkeys/0001-hostkey \
-   hostkeys/0002-hostkey \
-   hostkeys/0003-hostkey \
+   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 \