From bf36352bcdb8eeee76e63604a8ef74a61f899b43 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 16 Dec 2014 21:14:39 +0000
Subject: -adding single file for testing without autostarts above core level

---
 src/gns/test_gns_defaults.conf                     | 26 ++---------
 .../test_gnunet_daemon_hostlist_peer1.conf         |  1 +
 .../test_gnunet_daemon_hostlist_peer2.conf         |  1 +
 src/hostlist/test_hostlist_defaults.conf           |  1 +
 src/hostlist/test_learning_adv_peer.conf           |  5 +--
 src/hostlist/test_learning_learn_peer.conf         |  5 +--
 src/hostlist/test_learning_learn_peer2.conf        |  2 +-
 src/regex/test_regex_api_data.conf                 | 51 +++-------------------
 8 files changed, 16 insertions(+), 76 deletions(-)

(limited to 'src')

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 @@
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-gns-testing/
 
@@ -20,26 +23,3 @@ PLUGINS = tcp
 [transport-tcp]
 BINDTO = 127.0.0.1
 
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[cadet]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = 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
 HOSTLISTFILE = hostlists_peer1.file
 OPTIONS = -b -p
 SERVERS = http://localhost:12981/
+FORCESTART = YES
 
 [ats]
 PORT = 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
 HOSTLISTFILE = hostlists_peer2.file
 OPTIONS = -b -p
 SERVERS = http://localhost:12980/
+FORCESTART = YES
 
 [ats]
 PORT = 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 @@
 @INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
 
 [PATHS]
 GNUNET_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
 OPTIONS = -p -a
 SERVERS = http://localhost:12981/
 EXTERNAL_DNS_NAME = localhost
-
-[dht]
-AUTOSTART = NO
-
+FORCESTART = YES
 
 [ats]
 PORT = 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
 HOSTLISTFILE = hostlists_learn_peer.file
 OPTIONS = -b -e
 SERVERS = http://localhost:12981/
-
-[dht]
-AUTOSTART = NO
-
+FORCESTART = YES
 
 [ats]
 PORT = 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
 HOSTLISTFILE = hostlists_learn_peer2.file
 OPTIONS = -b -e
 SERVERS = http://localhost:12981/
-
+FORCESTART = 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 @@
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-regex-api/
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
 [dhtcache]
 QUOTA = 1 MB
 DATABASE = heap
@@ -24,35 +18,16 @@ MINIMUM-FRIENDS = 0
 WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
-[core]
-PORT = 2092
-
 [dht]
+AUTOSTART = YES
 PORT = 12370
 
+[regex]
+AUTOSTART = YES
+
 [transport]
 plugins = tcp
 NEIGHBOUR_LIMIT = 50
-PORT = 2091
-
-[peerinfo]
-PORT = 2090
-
-[resolver]
-PORT = 2089
-
-[statistics]
-PORT = 2088
-
-[arm]
-PORT = 2087
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 2094
-
-[TESTING]
-WEAKRANDOM = NO
 
 [nat]
 DISABLEV6 = YES
@@ -62,15 +37,3 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
-
-[dns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART=NO
-- 
cgit v1.2.3