aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-12-16 21:14:39 +0000
committerChristian Grothoff <christian@grothoff.org>2014-12-16 21:14:39 +0000
commitbf36352bcdb8eeee76e63604a8ef74a61f899b43 (patch)
tree04b46b5351cf84a266f6c5f19796f3570da1cca0
parentcffaa8b4a6591c02325a368dcc7cd3b999d1ef60 (diff)
downloadgnunet-bf36352bcdb8eeee76e63604a8ef74a61f899b43.tar.gz
gnunet-bf36352bcdb8eeee76e63604a8ef74a61f899b43.zip
-adding single file for testing without autostarts above core level
Diffstat
-rw-r--r--contrib/Makefile.am1
-rw-r--r--contrib/no_autostart_above_core.conf71
-rw-r--r--src/gns/test_gns_defaults.conf26
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer1.conf1
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer2.conf1
-rw-r--r--src/hostlist/test_hostlist_defaults.conf1
-rw-r--r--src/hostlist/test_learning_adv_peer.conf5
-rw-r--r--src/hostlist/test_learning_learn_peer.conf5
-rw-r--r--src/hostlist/test_learning_learn_peer2.conf2
-rw-r--r--src/regex/test_regex_api_data.conf51
10 files changed, 88 insertions, 76 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 363588abf..e20aa7812 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -45,6 +45,7 @@ endif
45 45
46EXTRA_DIST = \ 46EXTRA_DIST = \
47 no_forcestart.conf \ 47 no_forcestart.conf \
48 no_autostart_above_core.conf \
48 coverage.sh \ 49 coverage.sh \
49 report.sh \ 50 report.sh \
50 terminate.py.in \ 51 terminate.py.in \
diff --git a/contrib/no_autostart_above_core.conf b/contrib/no_autostart_above_core.conf
new file mode 100644
index 000000000..4636f79a9
--- /dev/null
+++ b/contrib/no_autostart_above_core.conf
@@ -0,0 +1,71 @@
1# Configuration to disable autostarting of
2# all services above the 'core' level.
3# (including resolver)
4
5[dns]
6AUTOSTART = NO
7
8[dht]
9AUTOSTART = NO
10
11[nse]
12AUTOSTART = NO
13
14[cadet]
15AUTOSTART = NO
16
17[datastore]
18AUTOSTART = NO
19
20[fs]
21AUTOSTART = NO
22
23[dv]
24AUTOSTART = NO
25
26[vpn]
27AUTOSTART = NO
28
29[consensus]
30AUTOSTART = NO
31
32[resolver]
33AUTOSTART = NO
34
35[namestore]
36AUTOSTART = NO
37
38[namecache]
39AUTOSTART = NO
40
41[identity]
42AUTOSTART = NO
43
44[revocation]
45AUTOSTART = NO
46
47[conversation]
48AUTOSTART = NO
49
50[peerstore]
51AUTOSTART = NO
52
53[psycstore]
54AUTOSTART = NO
55
56[gns]
57AUTOSTART = NO
58
59[regex]
60AUTOSTART = NO
61
62[set]
63AUTOSTART = NO
64
65[scalarproduct-bob]
66AUTOSTART = NO
67
68[scalarproduct-alice]
69AUTOSTART = NO
70
71
diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index e02c803b9..5bcec6dbf 100644
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,3 +1,6 @@
1@INLINE@ ../../contrib/no_forcestart.conf
2@INLINE@ ../../contrib/no_autostart_above_core.conf
3
1[PATHS] 4[PATHS]
2GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/ 5GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
3 6
@@ -20,26 +23,3 @@ PLUGINS = tcp
20[transport-tcp] 23[transport-tcp]
21BINDTO = 127.0.0.1 24BINDTO = 127.0.0.1
22 25
23[dns]
24AUTOSTART = NO
25
26[nse]
27AUTOSTART = NO
28
29[cadet]
30AUTOSTART = NO
31
32[datastore]
33AUTOSTART = NO
34
35[fs]
36AUTOSTART = NO
37
38[dv]
39AUTOSTART = NO
40
41[vpn]
42AUTOSTART = NO
43
44[consensus]
45AUTOSTART = NO
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 4fc4e8dd1..af86e374c 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -34,6 +34,7 @@ HTTPPORT = 12980
34HOSTLISTFILE = hostlists_peer1.file 34HOSTLISTFILE = hostlists_peer1.file
35OPTIONS = -b -p 35OPTIONS = -b -p
36SERVERS = http://localhost:12981/ 36SERVERS = http://localhost:12981/
37FORCESTART = YES
37 38
38[ats] 39[ats]
39PORT = 12971 40PORT = 12971
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 538a91602..11d32cd1a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -34,6 +34,7 @@ HTTPPORT = 12981
34HOSTLISTFILE = hostlists_peer2.file 34HOSTLISTFILE = hostlists_peer2.file
35OPTIONS = -b -p 35OPTIONS = -b -p
36SERVERS = http://localhost:12980/ 36SERVERS = http://localhost:12980/
37FORCESTART = YES
37 38
38[ats] 39[ats]
39PORT = 22971 40PORT = 22971
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index 2c5d26ec5..2c9e14fc1 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -1,4 +1,5 @@
1@INLINE@ ../../contrib/no_forcestart.conf 1@INLINE@ ../../contrib/no_forcestart.conf
2@INLINE@ ../../contrib/no_autostart_above_core.conf
2 3
3[PATHS] 4[PATHS]
4GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/ 5GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist/
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 12087a7b7..43db0992f 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -35,10 +35,7 @@ HOSTLISTFILE = hostlists_adv_peer.file
35OPTIONS = -p -a 35OPTIONS = -p -a
36SERVERS = http://localhost:12981/ 36SERVERS = http://localhost:12981/
37EXTERNAL_DNS_NAME = localhost 37EXTERNAL_DNS_NAME = localhost
38 38FORCESTART = YES
39[dht]
40AUTOSTART = NO
41
42 39
43[ats] 40[ats]
44PORT = 22971 41PORT = 22971
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 44415aa49..3411d3e70 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -34,10 +34,7 @@ HTTPPORT = 12980
34HOSTLISTFILE = hostlists_learn_peer.file 34HOSTLISTFILE = hostlists_learn_peer.file
35OPTIONS = -b -e 35OPTIONS = -b -e
36SERVERS = http://localhost:12981/ 36SERVERS = http://localhost:12981/
37 37FORCESTART = YES
38[dht]
39AUTOSTART = NO
40
41 38
42[ats] 39[ats]
43PORT = 12971 40PORT = 12971
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index f72790a45..de3e81271 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -34,4 +34,4 @@ HTTPPORT = 32980
34HOSTLISTFILE = hostlists_learn_peer2.file 34HOSTLISTFILE = hostlists_learn_peer2.file
35OPTIONS = -b -e 35OPTIONS = -b -e
36SERVERS = http://localhost:12981/ 36SERVERS = http://localhost:12981/
37 37FORCESTART = YES
diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 5c7ad1abd..84df06238 100644
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -1,15 +1,9 @@
1@INLINE@ ../../contrib/no_forcestart.conf
2@INLINE@ ../../contrib/no_autostart_above_core.conf
3
1[PATHS] 4[PATHS]
2GNUNET_TEST_HOME = /tmp/test-regex-api/ 5GNUNET_TEST_HOME = /tmp/test-regex-api/
3 6
4[fs]
5AUTOSTART = NO
6
7[resolver]
8AUTOSTART = NO
9
10[datastore]
11AUTOSTART = NO
12
13[dhtcache] 7[dhtcache]
14QUOTA = 1 MB 8QUOTA = 1 MB
15DATABASE = heap 9DATABASE = heap
@@ -24,35 +18,16 @@ MINIMUM-FRIENDS = 0
24WAN_QUOTA_IN = 1 GB 18WAN_QUOTA_IN = 1 GB
25WAN_QUOTA_OUT = 1 GB 19WAN_QUOTA_OUT = 1 GB
26 20
27[core]
28PORT = 2092
29
30[dht] 21[dht]
22AUTOSTART = YES
31PORT = 12370 23PORT = 12370
32 24
25[regex]
26AUTOSTART = YES
27
33[transport] 28[transport]
34plugins = tcp 29plugins = tcp
35NEIGHBOUR_LIMIT = 50 30NEIGHBOUR_LIMIT = 50
36PORT = 2091
37
38[peerinfo]
39PORT = 2090
40
41[resolver]
42PORT = 2089
43
44[statistics]
45PORT = 2088
46
47[arm]
48PORT = 2087
49
50[transport-tcp]
51TIMEOUT = 300 s
52PORT = 2094
53
54[TESTING]
55WEAKRANDOM = NO
56 31
57[nat] 32[nat]
58DISABLEV6 = YES 33DISABLEV6 = YES
@@ -62,15 +37,3 @@ BEHIND_NAT = NO
62ALLOW_NAT = NO 37ALLOW_NAT = NO
63INTERNAL_ADDRESS = 127.0.0.1 38INTERNAL_ADDRESS = 127.0.0.1
64EXTERNAL_ADDRESS = 127.0.0.1 39EXTERNAL_ADDRESS = 127.0.0.1
65
66[dns]
67AUTOSTART = NO
68
69[namestore]
70AUTOSTART = NO
71
72[nse]
73AUTOSTART = NO
74
75[vpn]
76AUTOSTART=NO
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 03:50:45 +0000