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 7389d68f628e3e3200d4ca49616e140d2413b686..739b6b1a1cd72603033d32b9e54a571de038103c 100644 (file)
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -1,59 +1,43 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-2/
-DEFAULTCONFIG = test_core_api_peer2.conf
-
-[resolver]
-PORT = 22464
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-#PREFIX = xterm -T resolver2 -e valgrind --tool=memcheck
-
-[transport]
-PORT = 22465
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-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
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/
 
 [arm]
-PORT = 22466
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-DEFAULTSERVICES = 
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
+PORT = 22460
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
-PORT = 22467
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-#PREFIX = xterm -T statistics2 -e valgrind --tool=memcheck
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
-[transport-tcp]
-PORT = 22468
-BINDTO = 127.0.0.1
-#DEBUG = YES
+[resolver]
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
-PORT = 22469
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-#PREFIX = xterm -T peerinfo2 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo2 -e 
-#DEBUG = YES
+PORT = 22463
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 22464
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [core]
-PORT = 22470
-UNIXPATH = /tmp/gnunet-p2-service-core.sock
-#PREFIX = xterm -T core2 -e
-#PREFIX = valgrind --tool=memcheck
-#DEBUG = YES
-#BINARY=/home/grothoff/bin/gnunet-service-core
+PORT = 22475
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock
+
+[ats]
+PORT = 22476
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
-[testing]
-WEAKRANDOM = YES
+[transport-tcp]
+PORT = 22467
 
-[fs]
-AUTOSTART = NO
+[transport-udp]
+PORT = 22468
 
-[datastore]
-AUTOSTART = NO
+[transport-unix]
+PORT = 22469
 
+[transport-http]
+PORT = 22470