-updating config files

11 files changed, 29 insertions, 7 deletions

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index d7a3d8ac1a..459ebf376d 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -49,8 +49,10 @@ AUTOSTART = YES
 PORT = 10004
 
 [testing]
-NUM_PEERS = 16 
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 16 
 TOPOLOGY = NONE
 CONNECT_TOPOLOGY = 2D_TORUS
 BLACKLIST_TOPOLOGY = 2D_TORUS
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 032416cd8f..06f9e46ef7 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -59,6 +59,8 @@ PORT = 2094
 
 [TESTING]
 WEAKRANDOM = NO
+
+[testing_old]
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [gnunetd]
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 6be3559ef4..56c03f61a3 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -49,8 +49,10 @@ AUTOSTART = YES
 PORT = 10004
 
 [testing]
-NUM_PEERS = 5
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 5
 TOPOLOGY = NONE
 CONNECT_TOPOLOGY = LINE
 BLACKLIST_TOPOLOGY = LINE
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index f181594b37..eae68f9484 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -82,6 +82,9 @@ NUM_GETS = 5
 NUM_PUTS = 5
 
 [TESTING]
+WEAKRANDOM = YES
+
+[testing_old]
 TOPOLOGY = FROM_FILE
 # file contains a ring
 CONNECT_TOPOLOGY = NONE
@@ -97,7 +100,6 @@ USE_PROGRESSBARS = YES
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 2
 #LOGNMODIFIER = .65
 #PERCENTAGE = .75
-WEAKRANDOM = YES
 NUM_PEERS = 10
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 2889a41792..cc47c6f363 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -45,6 +45,8 @@ BINDTO = 127.0.0.1
 
 [TESTING]
 WEAKRANDOM = YES
+
+[testing_old]
 NUM_PEERS = 2
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index fcb888c7aa..622f379440 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -59,6 +59,8 @@ DELAY = YES
 
 [testing]
 WEAKRANDOM = YES
+
+[testing_old]
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dhtcache]
diff --git a/src/integration-tests/test_connection_stability.conf b/src/integration-tests/test_connection_stability.conf
index ba2ae058a5..b3845452ad 100644
--- a/src/integration-tests/test_connection_stability.conf
+++ b/src/integration-tests/test_connection_stability.conf
@@ -27,8 +27,10 @@ PORT = 2569
 PORT = 2570
 
 [testing]
-NUM_PEERS = 5
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 5
 F2F = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 94e89d7050..5dc4613e05 100644
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -59,9 +59,11 @@ HOSTNAME = localhost
 # PREFIX = valgrind --leak-check=full
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
+[testing]
+WEAKRANDOM = YES
+
 [testing_old]
 NUM_PEERS = 16
-WEAKRANDOM = YES
 TOPOLOGY = 2D_TORUS
 CONNECT_TOPOLOGY = 2D_TORUS
 #TOPOLOGY_FILE = small.dat
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 3a3217dbc6..49f749fdad 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -104,8 +104,10 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 2000
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 2000
 TOPOLOGY = NONE
 #CONNECT_TOPOLOGY = SMALL_WORLD_RING
 CONNECT_TOPOLOGY = ERDOS_RENYI
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 48944c1190..4508e9ca7a 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -58,8 +58,10 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 10
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 10
 TOPOLOGY = NONE
 CONNECT_TOPOLOGY = SMALL_WORLD_RING
 PERCENTAGE = 3
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 0be8cd45bb..d98dc9de73 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -51,6 +51,8 @@ AUTOSTART = NO
 
 [testing]
 WEAKRANDOM = YES
+
+[testing_old]
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dns]