-fixes

[oweals/gnunet.git] / src / testing / test_testing_data_topology_none.conf

diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index 9ff8ca390a006761e04b9af0929d6d48cf73640f..dbee5d0b93076d5627c39207d57652fb70cbfc57 100644 (file)
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -1,56 +1,37 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 0
-
-[transport]
-PORT = 0
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
-#DEBUG = YES
-
-[topology]
-PORT = 0
+[TESTING]
+NUM_PEERS = 1000
+TOPOLOGY = NONE
+F2F = NO
+BLACKLIST_TOPOLOGY = NONE
+CONNECT_TOPOLOGY = RING
 
 [arm]
 PORT = 0
-DEFAULTSERVICES = 
 
 [statistics]
+AUTOSTART = NO
 PORT = 0
 
-[transport-tcp]
-PORT = 2568
+[resolver]
+AUTOSTART = NO
+PORT = 0
 
 [peerinfo]
 PORT = 0
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
+
+[transport]
+PORT = 0
 
 [core]
 PORT = 0
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
 
-[hostlist]
+[topology]
 PORT = 0
 
-[fs]
+[hostlist]
 PORT = 0
 
-[testing]
-NUM_PEERS = 200
-WEAKRANDOM = YES
-TOPOLOGY = NONE
-F2F = NO
-BLACKLIST_TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
-#DEBUG = YES