-confs

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 644899d21042f14e6ff4ea4eb68265156aa6fd2c..e96c31cf4b4641fef5fbaea1ec3003b3f7178741 100644 (file)
--- 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 4e42e5faf2eff84c9ac4edc0e15a77e65fb8a69f..5081553c9b815e3b71bae4985d08e4ea1c8496bb 100644 (file)
--- 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 5bb80dc1679ec4b0636e5946422b2ca904ea0388..9e12bb9fa3f8c9d7512aa67e976a502975145b77 100644 (file)
--- 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 393fc7e456fb4115767eff479cdb51f7482256c5..445f308176fe02fc52acd888291af0765f98a628 100644 (file)
--- 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 657b948853627238981b8ac643baf2c31e5a18fc..cac4e7b21cb6ab5f682bf026f5327f6526ccc8dd 100644 (file)
--- 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 03f594b5629266be95670ab1a98c3c50effcfeab..0ed1aee8faef51e3a45a321856a6c6e5e73c3631 100644 (file)
--- 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 b6982733f5ca3f22aeb9f7d20be9e78bb92eb9e7..47c861a72b794b097fea7cb7dd3b989d970d1867 100644 (file)
--- 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 6d445dd23cd28466742f5a2a3034b2d80fc51084..b48042908b611a4f7376fa10ddd42ac5ec706ba3 100644 (file)
--- 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 14fb71f1085bfa3d00de2caf9dca6a324798915e..ca4da89cb24376dd0c4aad2140bdfc5f815bf70c 100644 (file)
--- 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 6bf53a011ee0ddc75bf972806fedf64d91300f98..f01cac9d103405a70c85c7f9a2697d8e89d66b46 100644 (file)
--- 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 90a7e2b49004c5d7185ef2e59d531f267207e7f3..f515609bdfc2303600331076283ad19e29c2297b 100644 (file)
--- 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 523d98bb29e97b84ab3c983372ac753315674e44..a4a30c18cf81270a45807582a8956c8a16755804 100644 (file)
--- 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