Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / arm / test_arm_api_data.conf

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index d8354477eaee3c3603e7f404966bd0d38b33b788..14d5b8fc162c90197a95fca0ba6790b9a597902e 100644 (file)
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -1,14 +1,16 @@
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
 [PATHS]
-GNUNET_TEST_HOME = /tmp/test-gnunetd-arm/
+GNUNET_TEST_HOME = /tmp/test-gnunet-arm/
 
 [arm]
-PORT = 23354
-DEFAULTSERVICES =
 BINARY = gnunet-service-arm
 OPTIONS = -L ERROR
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [resolver]
+AUTOSTART = YES
 PORT = 23355
 # PREFIX = valgrind
 
@@ -20,11 +22,8 @@ BINARY = /will/be/overwritten/by/test_exponential_backoff
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
+[statistics]
+AUTOSTART = YES
 
 [core]
 AUTOSTART = NO
@@ -32,19 +31,8 @@ AUTOSTART = NO
 [transport]
 AUTOSTART = NO
 
-[peerinfo]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = YES
-
-[dns]
+[ats]
 AUTOSTART = NO
 
-[consensus]
-AUTOSTART = NO
-
-[nse]
+[peerinfo]
 AUTOSTART = NO
-
-