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 8ab08247c8f640b26fca6a75aaf8c6e177ecc6ec..14d5b8fc162c90197a95fca0ba6790b9a597902e 100644 (file)
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -1,37 +1,29 @@
+@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/no_autostart_above_core.conf
+
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-arm/
-DEFAULTCONFIG = test_arm_api_data.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-arm/
 
 [arm]
-PORT = 23354
-DEFAULTSERVICES =
 BINARY = gnunet-service-arm
 OPTIONS = -L ERROR
-# DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [resolver]
-# DEBUG = YES
+AUTOSTART = YES
 PORT = 23355
-
+# PREFIX = valgrind
 
 [do-nothing]
-#DEBUG = YES
 AUTOSTART = NO
 PORT = 2223
 HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = mockup-service
+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
@@ -39,10 +31,8 @@ AUTOSTART = NO
 [transport]
 AUTOSTART = NO
 
-[peerinfo]
+[ats]
 AUTOSTART = NO
 
-[statistics]
-AUTOSTART = YES
-# DEBUG = NO
-
+[peerinfo]
+AUTOSTART = NO