[GNUnet-SVN] r21328 - in gnunet/src/integration-tests: . confs

[gnunet]

Author: wachs
Date: 2012-05-07 17:17:31 +0200 (Mon, 07 May 2012)
New Revision: 21328

Modified:
   gnunet/src/integration-tests/Makefile.am
   gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
Log:
- for make dist


Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am    2012-05-07 14:28:44 UTC (rev 
21327)
+++ gnunet/src/integration-tests/Makefile.am    2012-05-07 15:17:31 UTC (rev 
21328)
@@ -116,8 +116,8 @@
 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 @@
    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 \

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf        
2012-05-07 14:28:44 UTC (rev 21327)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf        
2012-05-07 15:17:31 UTC (rev 21328)
@@ -154,7 +154,7 @@
 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

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf      
2012-05-07 14:28:44 UTC (rev 21327)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf      
2012-05-07 15:17:31 UTC (rev 21328)
@@ -143,7 +143,7 @@
 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