1 files changed, 32 insertions, 32 deletions
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 27dc0e82e..ac0c9c400 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -10,26 +10,26 @@ TOPOLOGY = RANDOM
 PORT = 12366
 [test-barriers]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12114
 BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
-FORCESTART = YES
+IMMEDIATE_START = YES
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [resolver]
 HOSTNAME = localhost
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [dhtcache]
 QUOTA = 1 MB
@@ -41,7 +41,7 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
-FORCESTART = YES
+IMMEDIATE_START = YES
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -49,8 +49,8 @@ WAN_QUOTA_IN = 3932160
 [core]
 PORT = 12092
-AUTOSTART = YES
+START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 USE_EPHEMERAL_KEYS = NO
 [transport-udp]
@@ -58,46 +58,46 @@ TIMEOUT = 300 s
 PORT = 12368
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns-helper-service-w32]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [peerinfo]
 NO_IO = YES
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
-FORCESTART = NO
-\ No newline at end of file
+IMMEDIATE_START = NO

diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in index 27dc0e82e..ac0c9c400 100644 --- a/src/testbed/test_testbed_api_barriers.conf.in +++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -1,5 +1,5 @@
1	[testbed]	1	[testbed]
2	AUTOSTART = NO	2	START_ON_DEMAND = NO
3	PORT = 12113	3	PORT = 12113
4	ACCEPT_FROM = 127.0.0.1;	4	ACCEPT_FROM = 127.0.0.1;
5	HOSTNAME = localhost	5	HOSTNAME = localhost
@@ -10,26 +10,26 @@ TOPOLOGY = RANDOM
10	PORT = 12366	10	PORT = 12366
11		11
12	[test-barriers]	12	[test-barriers]
13	AUTOSTART = NO	13	START_ON_DEMAND = NO
14	PORT = 12114	14	PORT = 12114
15	BINARY = /will/be/overwriten/in/test_testbed_api_barriers/	15	BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
16	FORCESTART = YES	16	IMMEDIATE_START = YES
17		17
18	[fs]	18	[fs]
19	AUTOSTART = NO	19	START_ON_DEMAND = NO
20	FORCESTART = NO	20	IMMEDIATE_START = NO
21		21
22	[resolver]	22	[resolver]
23	HOSTNAME = localhost	23	HOSTNAME = localhost
24	AUTOSTART = NO	24	START_ON_DEMAND = NO
25		25
26	[cadet]	26	[cadet]
27	AUTOSTART = NO	27	START_ON_DEMAND = NO
28	FORCESTART = NO	28	IMMEDIATE_START = NO
29		29
30	[dht]	30	[dht]
31	AUTOSTART = NO	31	START_ON_DEMAND = NO
32	FORCESTART = NO	32	IMMEDIATE_START = NO
33		33
34	[dhtcache]	34	[dhtcache]
35	QUOTA = 1 MB	35	QUOTA = 1 MB
@@ -41,7 +41,7 @@ ACCEPT_FROM6 = ::1;
41	ACCEPT_FROM = 127.0.0.1;	41	ACCEPT_FROM = 127.0.0.1;
42	NEIGHBOUR_LIMIT = 50	42	NEIGHBOUR_LIMIT = 50
43	PORT = 12365	43	PORT = 12365
44	FORCESTART = YES	44	IMMEDIATE_START = YES
45		45
46	[ats]	46	[ats]
47	WAN_QUOTA_OUT = 3932160	47	WAN_QUOTA_OUT = 3932160
@@ -49,8 +49,8 @@ WAN_QUOTA_IN = 3932160
49		49
50	[core]	50	[core]
51	PORT = 12092	51	PORT = 12092
52	AUTOSTART = YES	52	START_ON_DEMAND = YES
53	FORCESTART = YES	53	IMMEDIATE_START = YES
54	USE_EPHEMERAL_KEYS = NO	54	USE_EPHEMERAL_KEYS = NO
55		55
56	[transport-udp]	56	[transport-udp]
@@ -58,46 +58,46 @@ TIMEOUT = 300 s
58	PORT = 12368	58	PORT = 12368
59		59
60	[PATHS]	60	[PATHS]
61	GNUNET_TEST_HOME = /tmp/test-testbed/	61	GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
62		62
63	[dns]	63	[dns]
64	AUTOSTART = NO	64	START_ON_DEMAND = NO
65	FORCESTART = NO	65	IMMEDIATE_START = NO
66		66
67	[nse]	67	[nse]
68	AUTOSTART = NO	68	START_ON_DEMAND = NO
69	FORCESTART = NO	69	IMMEDIATE_START = NO
70		70
71	[vpn]	71	[vpn]
72	AUTOSTART = NO	72	START_ON_DEMAND = NO
73	FORCESTART = NO	73	IMMEDIATE_START = NO
74		74
75	[nat]	75	[nat]
76	RETURN_LOCAL_ADDRESSES = YES	76	RETURN_LOCAL_ADDRESSES = YES
77	FORCESTART = NO	77	IMMEDIATE_START = NO
78		78
79	[gns-helper-service-w32]	79	[gns-helper-service-w32]
80	AUTOSTART = NO	80	START_ON_DEMAND = NO
81		81
82	[consensus]	82	[consensus]
83	AUTOSTART = NO	83	START_ON_DEMAND = NO
84	FORCESTART = NO	84	IMMEDIATE_START = NO
85		85
86	[gns]	86	[gns]
87	AUTOSTART = NO	87	START_ON_DEMAND = NO
88	FORCESTART = NO	88	IMMEDIATE_START = NO
89		89
90	[statistics]	90	[statistics]
91	AUTOSTART = NO	91	START_ON_DEMAND = NO
92	FORCESTART = NO	92	IMMEDIATE_START = NO
93		93
94	[peerinfo]	94	[peerinfo]
95	NO_IO = YES	95	NO_IO = YES
96		96
97	[set]	97	[set]
98	AUTOSTART = NO	98	START_ON_DEMAND = NO
99	FORCESTART = NO	99	IMMEDIATE_START = NO
100		100
101	[revocation]	101	[revocation]
102	AUTOSTART = NO	102	START_ON_DEMAND = NO
103	FORCESTART = NO \ No newline at end of file	103	IMMEDIATE_START = NO