Merge remote-tracking branch 'origin/master' into identity_abe

[oweals/gnunet.git] / src / core / test_core_api_peer1.conf

diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index 0cea16038b47b3552a6c2f35f85d714387b8e1fd..3bbd030929e2420c74640f4bce907e526251d449 100644 (file)
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -1,42 +1,42 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-core-peer-1/
-DEFAULTCONFIG = test_core_api_peer1.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/
+
+[arm]
+PORT = 12460
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12461
 
 [resolver]
-PORT = 12464
-#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck
+PORT = 12462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12463
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
-PORT = 12465
-PLUGINS = tcp
-#PREFIX = xterm -T transport1 -e
-#PREFIX = xterm -T transport1 -e gdb -x cmd --args
-#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
-#DEBUG = YES
+PORT = 12464
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
-[arm]
-PORT = 12466
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
+[core]
+PORT = 12475
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
 
-[statistics]
-PORT = 12467
-#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
+[ats]
+PORT = 12476
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [transport-tcp]
+PORT = 12467
+
+[transport-udp]
 PORT = 12468
 
-[peerinfo]
+[transport-unix]
 PORT = 12469
-#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo1 -e
 
-[core]
+[transport-http]
 PORT = 12470
-#PREFIX = xterm -T core1 -e valgrind --tool=memcheck
-#OPTIONS = -l log-core-1
-#PREFIX = xterm -T core1 -e gdb -x cmd --args
-#PREFIX = xterm -T core1 -e 
-#DEBUG = YES
-
-[testing]
-WEAKRANDOM = YES