aboutsummaryrefslogtreecommitdiff
path: root/src/integration-tests
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-05-07 15:17:31 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-05-07 15:17:31 +0000
commit8ffb5491c86f8dc01385d5d808991ac519214542 (patch)
tree93d81ff66e70a06e59d0360517db1ab8eedd4d58 /src/integration-tests
parenta4ca6303e60aa1df352792e83ef687e9633a9e5d (diff)
downloadgnunet-8ffb5491c86f8dc01385d5d808991ac519214542.tar.gz
gnunet-8ffb5491c86f8dc01385d5d808991ac519214542.zip
- for make dist
Diffstat (limited to 'src/integration-tests')
-rw-r--r--src/integration-tests/Makefile.am10
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf2
3 files changed, 8 insertions, 6 deletions
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_
116EXTRA_DIST = \ 116EXTRA_DIST = \
117 gnunet_testing.py.in \ 117 gnunet_testing.py.in \
118 gnunet_pyexpect.py.in \ 118 gnunet_pyexpect.py.in \
119 test_integration_connection_value_tcp.py.in \ 119 test_integration_connection_values_tcp.py.in \
120 test_integration_connection_value_tcp_udp.py.in \ 120 test_integration_connection_values_tcp_udp.py.in \
121 test_integration_bootstrap_and_connect.py.in \ 121 test_integration_bootstrap_and_connect.py.in \
122 test_integration_bootstrap_and_connect_and_disconnect.py.in \ 122 test_integration_bootstrap_and_connect_and_disconnect.py.in \
123 test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \ 123 test_integration_bootstrap_and_connect_and_disconnect_nat.py.in \
@@ -133,8 +133,10 @@ EXTRA_DIST = \
133 confs/c_normal_client_tcp.conf \ 133 confs/c_normal_client_tcp.conf \
134 confs/c_normal_client_tcp_udp.conf \ 134 confs/c_normal_client_tcp_udp.conf \
135 confs/c_normal_client_tcp_udp_http.conf \ 135 confs/c_normal_client_tcp_udp_http.conf \
136 c_no_nat_client_http.conf \ 136 confs/c_no_nat_client_http.conf \
137 c_no_nat_client_http_2.conf \ 137 confs/c_no_nat_client_http_2.conf\
138 confs/c_no_nat_client_http.conf \
139 confs/c_no_nat_client_http_2.conf \
138 hostkeys/0000-hostkey \ 140 hostkeys/0000-hostkey \
139 hostkeys/0001-hostkey \ 141 hostkeys/0001-hostkey \
140 hostkeys/0002-hostkey \ 142 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
154NEIGHBOUR_LIMIT = 50 154NEIGHBOUR_LIMIT = 50
155ACCEPT_FROM = 127.0.0.1; 155ACCEPT_FROM = 127.0.0.1;
156ACCEPT_FROM6 = ::1; 156ACCEPT_FROM6 = ::1;
157PLUGINS = unix 157PLUGINS = unix tcp udp http
158UNIXPATH = /tmp/test-service-transport-22 158UNIXPATH = /tmp/test-service-transport-22
159BLACKLIST_FILE = $SERVICEHOME/blacklist 159BLACKLIST_FILE = $SERVICEHOME/blacklist
160UNIX_MATCH_UID = YES 160UNIX_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
143NEIGHBOUR_LIMIT = 50 143NEIGHBOUR_LIMIT = 50
144ACCEPT_FROM = 127.0.0.1; 144ACCEPT_FROM = 127.0.0.1;
145ACCEPT_FROM6 = ::1; 145ACCEPT_FROM6 = ::1;
146PLUGINS = unix 146PLUGINS = unix tcp udp http
147UNIXPATH = /tmp/test-service-transport-36 147UNIXPATH = /tmp/test-service-transport-36
148BLACKLIST_FILE = $SERVICEHOME/blacklist 148BLACKLIST_FILE = $SERVICEHOME/blacklist
149UNIX_MATCH_UID = YES 149UNIX_MATCH_UID = YES