From: Matthias Wachs Date: Mon, 7 May 2012 15:17:31 +0000 (+0000) Subject: - for make dist X-Git-Tag: initial-import-from-subversion-38251~13616 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8ffb5491c86f8dc01385d5d808991ac519214542;p=oweals%2Fgnunet.git - for make dist --- diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 633dc25de..e4fcceb60 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am @@ -116,8 +116,8 @@ 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_bootstrap_and_connect.py.in \ test_integration_bootstrap_and_connect_and_disconnect.py.in \ test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \ @@ -133,8 +133,10 @@ EXTRA_DIST = \ confs/c_normal_client_tcp.conf \ confs/c_normal_client_tcp_udp.conf \ confs/c_normal_client_tcp_udp_http.conf \ - c_no_nat_client_http.conf \ - 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_http.conf \ + confs/c_no_nat_client_http_2.conf \ hostkeys/0000-hostkey \ hostkeys/0001-hostkey \ hostkeys/0002-hostkey \ diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index 2d575e245..9d1413d98 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf @@ -154,7 +154,7 @@ BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -PLUGINS = unix +PLUGINS = unix tcp udp http UNIXPATH = /tmp/test-service-transport-22 BLACKLIST_FILE = $SERVICEHOME/blacklist UNIX_MATCH_UID = YES diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf index 7c21a3665..365035636 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf @@ -143,7 +143,7 @@ BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -PLUGINS = unix +PLUGINS = unix tcp udp http UNIXPATH = /tmp/test-service-transport-36 BLACKLIST_FILE = $SERVICEHOME/blacklist UNIX_MATCH_UID = YES