-minor cleanups in testing

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

diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index 41bc1122d3dc0929562bf3e89146ee0cc697e9ea..ef95cb1fdd2a48cdfbcc0e25df2e8b8cf03e2e9c 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -1,48 +1,10 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
+[TESTING]
+NUM_PEERS = 20
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
+CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
 
-[transport]
-PORT = 2565
-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
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#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
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-TOPOLOGY = 0
-CONNECT_TOPOLOGY_OPTION = 2
-CONNECT_TOPOLOGY_OPTION_MODIFIER = 1.0
-F2F = YES