diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-10 17:11:06 +0000 |
commit | b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a (patch) | |
tree | be6defbdf18e3af9bdcc979cf27b253fe0b4d5f9 /src/testing | |
parent | 3871fc32bbd05da817d94f4188023a4edebc367a (diff) | |
download | gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.tar.gz gnunet-b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a.zip |
moving away from DEFAULTSERVICES to per-section FORCESTART, thus addressing #3565 indirectly
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_testing_defaults.conf | 57 | ||||
-rw-r--r-- | src/testing/test_testing_sharedservices.conf | 58 |
2 files changed, 0 insertions, 115 deletions
diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf index 7a174b9dd..ec0334c05 100644 --- a/src/testing/test_testing_defaults.conf +++ b/src/testing/test_testing_defaults.conf | |||
@@ -1,36 +1,15 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | GNUNET_TEST_HOME = /tmp/test-gnunet-testing/ | 2 | GNUNET_TEST_HOME = /tmp/test-gnunet-testing/ |
3 | 3 | ||
4 | [resolver] | ||
5 | PORT = 2564 | ||
6 | |||
7 | [transport] | 4 | [transport] |
8 | PORT = 2565 | ||
9 | PLUGINS = tcp | 5 | PLUGINS = tcp |
10 | 6 | ||
11 | [transport-tcp] | 7 | [transport-tcp] |
12 | TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM; | 8 | TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM; |
13 | 9 | ||
14 | [arm] | ||
15 | PORT = 2566 | ||
16 | DEFAULTSERVICES = | ||
17 | |||
18 | [statistics] | ||
19 | PORT = 2567 | ||
20 | |||
21 | [transport-tcp] | 10 | [transport-tcp] |
22 | PORT = 2568 | ||
23 | BINDTO = 127.0.0.1 | 11 | BINDTO = 127.0.0.1 |
24 | 12 | ||
25 | [peerinfo] | ||
26 | PORT = 2569 | ||
27 | |||
28 | [core] | ||
29 | PORT = 2570 | ||
30 | |||
31 | [dht] | ||
32 | AUTOSTART = NO | ||
33 | |||
34 | [nat] | 13 | [nat] |
35 | DISABLEV6 = YES | 14 | DISABLEV6 = YES |
36 | ENABLE_UPNP = NO | 15 | ENABLE_UPNP = NO |
@@ -40,39 +19,3 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
40 | EXTERNAL_ADDRESS = 127.0.0.1 | 19 | EXTERNAL_ADDRESS = 127.0.0.1 |
41 | USE_LOCALADDR = NO | 20 | USE_LOCALADDR = NO |
42 | 21 | ||
43 | [dns] | ||
44 | AUTOSTART = NO | ||
45 | |||
46 | [nse] | ||
47 | AUTOSTART = NO | ||
48 | |||
49 | [cadet] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | [datastore] | ||
53 | AUTOSTART = NO | ||
54 | |||
55 | [fs] | ||
56 | AUTOSTART = NO | ||
57 | |||
58 | [dv] | ||
59 | AUTOSTART = NO | ||
60 | |||
61 | [chat] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | [vpn] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | [gns] | ||
68 | AUTOSTART = NO | ||
69 | |||
70 | [namestore] | ||
71 | AUTOSTART = NO | ||
72 | |||
73 | [lockmanager] | ||
74 | AUTOSTART = NO | ||
75 | |||
76 | [consensus] | ||
77 | AUTOSTART = NO | ||
78 | |||
diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf index b8408774f..e1830edd2 100644 --- a/src/testing/test_testing_sharedservices.conf +++ b/src/testing/test_testing_sharedservices.conf | |||
@@ -6,37 +6,15 @@ PORT = 15000 | |||
6 | UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock | 6 | UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock |
7 | DIR = /tmp/testbed-logger | 7 | DIR = /tmp/testbed-logger |
8 | 8 | ||
9 | [resolver] | ||
10 | PORT = 2564 | ||
11 | |||
12 | [transport] | 9 | [transport] |
13 | PORT = 2565 | ||
14 | PLUGINS = tcp | 10 | PLUGINS = tcp |
15 | 11 | ||
16 | [transport-tcp] | 12 | [transport-tcp] |
17 | TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM; | 13 | TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM; |
18 | 14 | ||
19 | [arm] | ||
20 | PORT = 2566 | ||
21 | DEFAULTSERVICES = | ||
22 | |||
23 | [statistics] | ||
24 | PORT = 2567 | ||
25 | |||
26 | [transport-tcp] | 15 | [transport-tcp] |
27 | PORT = 2568 | ||
28 | BINDTO = 127.0.0.1 | 16 | BINDTO = 127.0.0.1 |
29 | 17 | ||
30 | [peerinfo] | ||
31 | PORT = 2569 | ||
32 | AUTOSTART = NO | ||
33 | |||
34 | [core] | ||
35 | PORT = 2570 | ||
36 | |||
37 | [dht] | ||
38 | AUTOSTART = NO | ||
39 | |||
40 | [nat] | 18 | [nat] |
41 | DISABLEV6 = YES | 19 | DISABLEV6 = YES |
42 | ENABLE_UPNP = NO | 20 | ENABLE_UPNP = NO |
@@ -46,39 +24,3 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
46 | EXTERNAL_ADDRESS = 127.0.0.1 | 24 | EXTERNAL_ADDRESS = 127.0.0.1 |
47 | USE_LOCALADDR = NO | 25 | USE_LOCALADDR = NO |
48 | 26 | ||
49 | [dns] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | [nse] | ||
53 | AUTOSTART = NO | ||
54 | |||
55 | [cadet] | ||
56 | AUTOSTART = NO | ||
57 | |||
58 | [datastore] | ||
59 | AUTOSTART = NO | ||
60 | |||
61 | [fs] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | [dv] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | [chat] | ||
68 | AUTOSTART = NO | ||
69 | |||
70 | [vpn] | ||
71 | AUTOSTART = NO | ||
72 | |||
73 | [gns] | ||
74 | AUTOSTART = NO | ||
75 | |||
76 | [namestore] | ||
77 | AUTOSTART = NO | ||
78 | |||
79 | [lockmanager] | ||
80 | AUTOSTART = NO | ||
81 | |||
82 | [consensus] | ||
83 | AUTOSTART = NO | ||
84 | |||