From 046281ef438cf4d3c7389042a650d49436324e83 Mon Sep 17 00:00:00 2001
From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 17 Sep 2012 10:06:28 +0000
Subject: [PATCH] -confs

---
 src/integration-tests/confs/c_bootstrap_server.conf  | 10 ++++++++++
 .../confs/c_bootstrap_server_w_massif.conf           |  8 ++++----
 src/integration-tests/confs/c_nat_client.conf        | 12 +++++++++++-
 src/integration-tests/confs/c_no_nat_client.conf     | 11 +++++++++++
 src/integration-tests/confs/c_no_nat_client_2.conf   | 10 ++++++++++
 .../confs/c_no_nat_client_http.conf                  | 10 ++++++++++
 .../confs/c_no_nat_client_http_2.conf                | 10 ++++++++++
 .../confs/c_no_nat_client_unix.conf                  | 10 ++++++++++
 .../confs/c_no_nat_client_unix_2.conf                | 10 ++++++++++
 src/integration-tests/confs/c_normal_client_tcp.conf | 12 +++++++++++-
 .../confs/c_normal_client_tcp_udp.conf               | 10 ++++++++++
 .../confs/c_normal_client_tcp_udp_http.conf          | 10 ++++++++++
 12 files changed, 117 insertions(+), 6 deletions(-)

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 644899d21..e96c31cf4 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -349,6 +349,16 @@ UNIXPATH = /tmp/test-service-dht-1
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_server-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_server-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
index 4e42e5faf..5081553c9 100644
--- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
+++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
@@ -1,6 +1,6 @@
 [PATHS]
 SERVICEHOME = /tmp/c_bootstrap_server/
-DEFAULTCONFIG = confs/c_bootstrap_server.conf
+DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf
 
 [gnunetd]
 #HOSTKEY = $SERVICEHOME/.hostkey
@@ -143,7 +143,7 @@ ATS_MIN_INTERVAL = 15000
 ATS_EXEC_INTERVAL = 30000
 
 [transport]
-PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif
+#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif
 AUTOSTART = YES
 PORT = 20011
 HOSTNAME = localhost
@@ -274,7 +274,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
+DEFAULTSERVICES = topology hostlist fs dht gns
 UNIXPATH = /tmp/test-service-arm-4
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
@@ -361,4 +361,4 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [lockmanager]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 5bb80dc16..9e12bb9fa 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -359,5 +359,15 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_nat_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_nat_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [lockmanager]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 393fc7e45..445f30817 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -150,6 +150,7 @@ ATS_EXEC_INTERVAL = 30000
 
 [transport]
 #DEBUG = YES
+#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif
 AUTOSTART = YES
 PORT = 20029
 HOSTNAME = localhost
@@ -360,5 +361,15 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [lockmanager]
 AUTOSTART = NO
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 657b94885..cac4e7b21 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -342,6 +342,16 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [gns]
 AUTOSTART = NO
 
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf
index 03f594b56..0ed1aee8f 100644
--- a/src/integration-tests/confs/c_no_nat_client_http.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http.conf
@@ -357,6 +357,16 @@ UNIXPATH = /tmp/test-service-dht-15
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index b6982733f..47c861a72 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -350,3 +350,13 @@ UNIX_MATCH_GID = YES
 DATABASE = sqlite
 QUOTA = 1 MB
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
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 6d445dd23..b48042908 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -360,6 +360,16 @@ UNIXPATH = /tmp/test-service-dht-15
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
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 14fb71f10..ca4da89cb 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
@@ -349,6 +349,16 @@ UNIXPATH = /tmp/test-service-dht-29
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index 6bf53a011..f01cac9d1 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -355,6 +355,16 @@ UNIXPATH = /tmp/test-service-dht-43
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
-QUOTA = 1 MB
\ No newline at end of file
+QUOTA = 1 MB
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index 90a7e2b49..f515609bd 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -355,6 +355,16 @@ UNIXPATH = /tmp/test-service-dht-43
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
\ No newline at end of file
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index 523d98bb2..a4a30c18c 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -355,6 +355,16 @@ UNIXPATH = /tmp/test-service-dht-43
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 
+[chat]
+UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp_http
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
 [dhtcache]
 DATABASE = sqlite
 QUOTA = 1 MB
\ No newline at end of file
-- 
2.25.1