only run malicious tests if malicious features are enabled

[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 157a0302795c10822523d12489746fe103aa6ad2..fef6cfb4003c35035527cc00428e8679a363ce86 100644 (file)
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -1,51 +1,38 @@
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
+
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-arm/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-arm/
 
 [arm]
-PORT = 23354
-DEFAULTSERVICES =
 BINARY = gnunet-service-arm
 OPTIONS = -L ERROR
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [resolver]
+START_ON_DEMAND = YES
 PORT = 23355
 # PREFIX = valgrind
 
 [do-nothing]
-AUTOSTART = NO
-PORT = 2223
+START_ON_DEMAND = NO
+PORT = 48223
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = /will/be/overwritten/by/test_exponential_backoff
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
+[statistics]
+START_ON_DEMAND = YES
 
 [core]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [transport]
-AUTOSTART = NO
-
-[peerinfo]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
+[ats]
+START_ON_DEMAND = NO
 
+[peerinfo]
+START_ON_DEMAND = NO