minor test cleanup

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

diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index b7de82d0f82f84940b3cb2691c70dc267ec31c26..739b6b1a1cd72603033d32b9e54a571de038103c 100644 (file)
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,45 +1,43 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-2/
-DEFAULTCONFIG = test_core_api_peer2.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/
+
+[arm]
+PORT = 22460
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
-PORT = 22464
-#PREFIX = xterm -T resolver2 -e valgrind --tool=memcheck
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 22463
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
-PORT = 22465
-PLUGINS = tcp
-#PREFIX = xterm -T transport2 -e gdb --args
-#PREFIX = xterm -e xterm -T transport2 -e gdb --args
-#PREFIX = xterm -T transport2 -e
-#PREFIX = xterm -T transport2 -e valgrind --tool=memcheck
-#DEBUG = NO
+PORT = 22464
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
-[arm]
-PORT = 22466
-DEFAULTSERVICES = resolver
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
+[core]
+PORT = 22475
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock
 
-[statistics]
-PORT = 22467
-#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck
+[ats]
+PORT = 22476
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
 [transport-tcp]
+PORT = 22467
+
+[transport-udp]
 PORT = 22468
-#DEBUG = YES
 
-[peerinfo]
+[transport-unix]
 PORT = 22469
-#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo2 -e 
-#DEBUG = YES
 
-[core]
+[transport-http]
 PORT = 22470
-#PREFIX = xterm -T core2 -e
-#PREFIX = valgrind --tool=memcheck
-#DEBUG = NO
-#BINARY=/home/grothoff/bin/gnunet-service-core
-
-[testing]
-WEAKRANDOM = YES