+

Signed-off-by: Nils Gillmann <ng0@n0.is>

diff --git a/src/ats-tests/template_perf_ats.conf b/src/ats-tests/template_perf_ats.conf
index 9d320c3dd0f75156d14efcc8e6aeafe78c01f5cd..74f608bfbc222a00544bca82a80a4f873fe28b1d 100644 (file)
--- a/src/ats-tests/template_perf_ats.conf
+++ b/src/ats-tests/template_perf_ats.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [testbed]
 # How long should operations wait?

diff --git a/src/conversation/test_conversation.conf b/src/conversation/test_conversation.conf
index 87c4b8f0764f238ee3a4235cdbb5fefd5c5d04dd..e77b41003f1b356e21e666f8fd01f9a3c30ec897 100644 (file)
--- a/src/conversation/test_conversation.conf
+++ b/src/conversation/test_conversation.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [conversation]
 LINE=1

diff --git a/src/credential/test_credential_defaults.conf b/src/credential/test_credential_defaults.conf
index 328846a10ac180b5c732b07c148d0d7854aaa61c..39f82ad16544b7784072948381df6f9155d45a7b 100644 (file)
--- a/src/credential/test_credential_defaults.conf
+++ b/src/credential/test_credential_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-testing/

diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 79344cd66e690a2a0fd5c3499a70579de106652a..42661b25d50a725196d9bc07a5a5623bc23da0f4 100644 (file)
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-fs-lib/

diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 261dab6edd2c2abaae3e8d55312ec9ca0e435c85..01825fafea83d921ff47bec176b842d602844433 100644 (file)
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-testing/

diff --git a/src/identity-provider/test_idp_defaults.conf b/src/identity-provider/test_idp_defaults.conf
index d7de3ce1222fa2592063a0adb25815c2ea08e3ad..a9a197dea886f74db7e1cfc89f7467716195674b 100644 (file)
--- a/src/identity-provider/test_idp_defaults.conf
+++ b/src/identity-provider/test_idp_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-testing/

diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 836255163f070cee9d96004682f322494aec6268..4e2563a8a2ccba42438b8d248526ca37ac6bd66e 100644 (file)
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [testbed]
 HOSTNAME = localhost

diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 8c87eeb962c834bc996b2602d77f2c087aa55818..60dcdc0b63c61f97d8eac3fbdc0303a5da976a05 100644 (file)
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -1,5 +1,5 @@
-@INLINE@ ../../contrib/no_forcestart.conf
-@INLINE@ ../../contrib/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/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
index 1beeba931e63506e7a102bbaab6d38b238a4492f..14ecf60641df14f9275b4c003bef7a01ed06a3aa 100644 (file)
--- a/src/revocation/test_revocation.conf
+++ b/src/revocation/test_revocation.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [paths]
 GNUNET_HOME=$GNUNET_TMP/test-revocation-service

diff --git a/src/social/test_social.conf b/src/social/test_social.conf
index 701789313295b6cc3c249543ae85b4aa3af2ed20..df9815fd2e95aa6892d6933dc2274b2a3f9d0cd9 100644 (file)
--- a/src/social/test_social.conf
+++ b/src/social/test_social.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-social/

diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
index ddb523986cf0563fc7e8ec2e11766b53438dae7c..3f38eeab73b79ac62772b52982b09c75eada9e30 100644 (file)
--- a/src/transport/test_transport_defaults.conf
+++ b/src/transport/test_transport_defaults.conf
@@ -1,4 +1,4 @@
-@INLINE@ ../../contrib/no_forcestart.conf
+@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport-api/