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 4726d635d47774037449a02bad0b59332b802e68..3bbd030929e2420c74640f4bce907e526251d449 100644 (file)
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -1,67 +1,42 @@
+@INLINE@ test_core_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-core-peer-1/
-DEFAULTCONFIG = test_core_api_peer1.conf
-
-[resolver]
-PORT = 12464
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck
-#PREFIX = valgrind --leak-check=full --log-file=resolver%p
-
-[transport]
-PORT = 12465
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-PLUGINS = tcp
-#PREFIX = xterm -T transport1 -e
-#PREFIX= xterm -e xterm -T transport1 -e gdb --args
-#PREFIX = xterm -T transport1 -e gdb --args
-#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
-#DEBUG = YES
+GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/
 
 [arm]
-PORT = 12466
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-DEFAULTSERVICES = 
-#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
+PORT = 12460
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
-PORT = 12467
-#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
+PORT = 12461
 
-[transport-tcp]
-PORT = 12468
-BINDTO = 127.0.0.1
-#DEBUG = YES
+[resolver]
+PORT = 12462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
-PORT = 12469
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck
-#PREFIX = xterm -T peerinfo1 -e
-#DEBUG = YES
+PORT = 12463
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
-[core]
-PORT = 12470
-UNIXPATH = /tmp/gnunet-p1-service-core.sock
-#PREFIX = valgrind --tool=memcheck
-#PREFIX = valgrind --tool=callgrind
-#OPTIONS = -l log-core-1
-#PREFIX = xterm -e xterm -T core1 -e gdb --args
-#PREFIX = xterm -T core1 -e 
-#DEBUG = YES
-#BINARY=/home/grothoff/bin/gnunet-service-core
-
-[testing]
-WEAKRANDOM = YES
+[transport]
+PORT = 12464
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
-[fs]
-AUTOSTART = NO
+[core]
+PORT = 12475
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
 
-[datastore]
-AUTOSTART = NO
+[ats]
+PORT = 12476
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
+[transport-tcp]
+PORT = 12467
 
-[dht]
-AUTOSTART = NO
+[transport-udp]
+PORT = 12468
 
+[transport-unix]
+PORT = 12469
 
+[transport-http]
+PORT = 12470