commit f8ba862ae6ec95c3639718528ace13623b945459 parent 5408fe1369ee8eff6611a53b76e4246b8c7b0cae Author: Martin Schanzenbach <schanzen@gnunet.org> Date: Sun, 19 Nov 2023 16:36:16 +0100 tests: fix config locations; minor fixes Diffstat:
33 files changed, 41 insertions(+), 75 deletions(-)
diff --git a/contrib/conf/gnunet/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf @@ -74,9 +74,6 @@ START_ON_DEMAND = NO [social] START_ON_DEMAND = NO -[psyc] -START_ON_DEMAND = NO - [rps] START_ON_DEMAND = NO @@ -89,8 +86,5 @@ START_ON_DEMAND = NO [sensor] START_ON_DEMAND = NO -[zonemaster-monitor] -START_ON_DEMAND = NO - [zonemaster] START_ON_DEMAND = NO diff --git a/contrib/conf/gnunet/no_forcestart.conf b/contrib/conf/gnunet/no_forcestart.conf @@ -40,12 +40,6 @@ IMMEDIATE_START = NO [zonemaster] IMMEDIATE_START = NO -[zonemaster-monitor] -IMMEDIATE_START = NO - -[psyc] -IMMEDIATE_START = NO - [rps] IMMEDIATE_START = NO diff --git a/src/cli/gns/test_gns_lookup.conf b/src/cli/gns/test_gns_lookup.conf @@ -22,10 +22,6 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 [namestore] #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/ns_log -[zonemaster-monitor] -IMMEDIATE_START = YES -START_ON_DEMAND = YES - [zonemaster] IMMEDIATE_START = YES START_ON_DEMAND = YES diff --git a/src/cli/gns/test_gns_multiple_record_lookup.sh b/src/cli/gns/test_gns_multiple_record_lookup.sh @@ -45,15 +45,12 @@ PKEY=`$DO_TIMEOUT gnunet-identity -V -C $OTHER_EGO -c test_gns_lookup_peer2.conf # stdin and do them _all_ *atomically*. Then we would not need to do this. gnunet-arm -c test_gns_lookup_peer2.conf -k zonemaster -gnunet-arm -c test_gns_lookup_peer2.conf -k zonemaster-monitor gnunet-namestore -p -z $OTHER_EGO -a -n $LABEL -t A -V $TEST_IP -e 3600s -c test_gns_lookup_peer2.conf gnunet-namestore -p -z $OTHER_EGO -a -n $LABEL -t AAAA -V $TEST_IPV6 -e 3600s -c test_gns_lookup_peer2.conf gnunet-namestore -D -z $OTHER_EGO -n $LABEL gnunet-arm -c test_gns_lookup_peer2.conf -i zonemaster -gnunet-arm -c test_gns_lookup_peer2.conf -i zonemaster-monitor - gnunet-arm -s -c test_gns_lookup_peer1.conf diff --git a/src/contrib/service/abd/test_abd_defaults.conf b/src/contrib/service/abd/test_abd_defaults.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-abd-testing/ diff --git a/src/contrib/service/conversation/test_conversation.conf b/src/contrib/service/conversation/test_conversation.conf @@ -1,13 +1,9 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [conversation] LINE=1 #PREFIX = valgrind -[zonemaster-monitor] -IMMEDIATE_START = YES -START_ON_DEMAND = YES - [zonemaster] IMMEDIATE_START = YES START_ON_DEMAND = YES diff --git a/src/contrib/service/rps/profiler_rps.conf b/src/contrib/service/rps/profiler_rps.conf @@ -133,7 +133,3 @@ START_ON_DEMAND = NO [fs] IMMEDIATE_START = NO START_ON_DEMAND = NO - -[zonemaster-monitor] -IMMEDIATE_START = NO -START_ON_DEMAND = NO diff --git a/src/contrib/service/scalarproduct/test_scalarproduct.conf b/src/contrib/service/scalarproduct/test_scalarproduct.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-scalarproduct/ diff --git a/src/contrib/service/set/test_set.conf b/src/contrib/service/set/test_set.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/ diff --git a/src/lib/util/gnunet_error_codes.c b/src/lib/util/gnunet_error_codes.c @@ -17,6 +17,7 @@ SPDX-License-Identifier: AGPL3.0-or-later */ +#include "platform.h" #include "gnunet_error_codes.h" #include <stddef.h> #include <microhttpd.h> diff --git a/src/plugin/datastore/test_defaults.conf b/src/plugin/datastore/test_defaults.conf @@ -1,5 +1,5 @@ -@inline@ ../../contrib/conf/gnunet/no_autostart_above_core.conf -@inline@ ../../contrib/conf/gnunet/no_forcestart.conf +@inline@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf +@inline@ ../../../contrib/conf/gnunet/no_forcestart.conf [datastore] PORT = 22654 diff --git a/src/service/arm/test_arm_api_data.conf b/src/service/arm/test_arm_api_data.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-arm/ diff --git a/src/service/core/test_core_defaults.conf b/src/service/core/test_core_defaults.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core/ diff --git a/src/service/datastore/test_defaults.conf b/src/service/datastore/test_defaults.conf @@ -1,5 +1,5 @@ -@inline@ ../../contrib/conf/gnunet/no_autostart_above_core.conf -@inline@ ../../contrib/conf/gnunet/no_forcestart.conf +@inline@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf +@inline@ ../../../contrib/conf/gnunet/no_forcestart.conf [datastore] PORT = 22654 diff --git a/src/service/dht/test_dht_2dtorus.conf b/src/service/dht/test_dht_2dtorus.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/ diff --git a/src/service/dht/test_dht_api_data.conf b/src/service/dht/test_dht_api_data.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-dht-api/ diff --git a/src/service/dht/test_dht_api_peer1.conf b/src/service/dht/test_dht_api_peer1.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [dhtcache] QUOTA = 1 MB diff --git a/src/service/dht/test_dht_line.conf b/src/service/dht/test_dht_line.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/ diff --git a/src/service/dht/test_dht_monitor.conf b/src/service/dht/test_dht_monitor.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [dhtcache] diff --git a/src/service/dht/test_dht_multipeer.conf b/src/service/dht/test_dht_multipeer.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [dht] START_ON_DEMAND = YES diff --git a/src/service/fs/test_fs_defaults.conf b/src/service/fs/test_fs_defaults.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-lib/ diff --git a/src/service/gns/test_gns_proxy.conf b/src/service/gns/test_gns_proxy.conf @@ -13,10 +13,6 @@ RECORD_PUT_INTERVAL = 1 h ZONE_PUBLISH_TIME_WINDOW = 1 h DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 -[zonemaster-monitor] -IMMEDIATE_START = YES -START_ON_DEMAND = YES - [zonemaster] IMMEDIATE_START = YES START_ON_DEMAND = YES diff --git a/src/service/hostlist/test_hostlist_defaults.conf b/src/service/hostlist/test_hostlist_defaults.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-hostlist/ diff --git a/src/service/messenger/test_messenger_api.conf b/src/service/messenger/test_messenger_api.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [testbed] HOSTNAME = localhost diff --git a/src/service/namestore/test_namestore_api.conf b/src/service/namestore/test_namestore_api.conf @@ -23,10 +23,6 @@ START_ON_DEMAND = YES IMMEDIATE_START = NO -[zonemaster-monitor] -START_ON_DEMAND = YES -IMMEDIATE_START = YES - [identity] START_ON_DEMAND = YES diff --git a/src/service/nse/test_nse.conf b/src/service/nse/test_nse.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-nse-multipeer/ diff --git a/src/service/reclaim/test_reclaim_defaults.conf b/src/service/reclaim/test_reclaim_defaults.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-testing/ diff --git a/src/service/regex/test_regex_api_data.conf b/src/service/regex/test_regex_api_data.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-regex-api/ diff --git a/src/service/revocation/test_revocation.conf b/src/service/revocation/test_revocation.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [paths] GNUNET_HOME=$GNUNET_TMP/test-revocation-service diff --git a/src/service/seti/test_seti.conf b/src/service/seti/test_seti.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/ diff --git a/src/service/setu/test_setu.conf b/src/service/setu/test_setu.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/ diff --git a/src/service/statistics/test_statistics_api_data.conf b/src/service/statistics/test_statistics_api_data.conf @@ -1,5 +1,5 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf -@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-statistics/ diff --git a/src/service/transport/test_transport_defaults.conf b/src/service/transport/test_transport_defaults.conf @@ -1,4 +1,4 @@ -@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf +@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf [PATHS] GNUNET_TEST_HOME = $GNUNET_TMP/test-tng/