follow-up, fix conf locations

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

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index 57799ccc853b894ac09cfc3966698200923882f3..b032cc95ad0446bd81dd5199074c9bdcb2132d63 100644 (file)
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_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-gnunet-arm/

diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index 669dd2a9cd662d6a912b2e47ad5d028c02a83126..7c7dad99e2643cddadcefac0124173cb72889bba 100644 (file)
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.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-gnunet-core/

diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index 67d782f3a77ae5cbd7719ab02b6027c9c8fab126..08e630eb0bc7ec188f28cc3d116c1134f444e68a 100644 (file)
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -1,5 +1,5 @@
-@inline@ ../../contrib/no_autostart_above_core.conf
-@inline@ ../../contrib/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/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index de138e53746455b74993da9c678a6cb64fe73d68..a541e8443990b39db7e00796c2723c116809b326 100644 (file)
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.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_dht_2dtorus/
 

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 6f5bf8525bf93b813fbc48354e41413183304f82..a2c1829c691659323a8e1ae3e1ed1b061285934b 100644 (file)
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_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-dht-api/

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index b563f5096eba9a4496e4f51631373d27df55d5f6..b4164077f23b2eea69153c6a39c33544ab6ce287 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.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
 
 [dhtcache]
 QUOTA = 1 MB

diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 81ce94390f7fee619fd71b5c7281936fe72b5a2f..5368b0bafb5ed60c42d1efc91405b0b88c5f414d 100644 (file)
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.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_dht_line/
 

diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index e3356374644f1cce62b79eb7f52d8f13e359326a..c0d457e89dfcbc3c7254d6d3782ef22cc767af86 100644 (file)
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.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
 
 
 [dhtcache]

diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 5251883aafe93f07096bc981c317fda54a88d539..4296d783e36eea13e9308dc632509d3f5d39404c 100644 (file)
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.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
 
 [dht]
 AUTOSTART = YES

diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index 64e9acd516a455642fdb49929e4e1bd53bc76ee3..dcd2790b0670c931a01aa05c5be1b091c0b20098 100644 (file)
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.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-gnunet-hostlist/

diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 1be582650718aa0028571062a00d9c7a1dadb340..39020515f64e71fb0ace1bbd6cafa976e323a741 100644 (file)
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.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
 
 [fs]
 FORCESTART = YES

diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 07409ea2b315c52f7a3ab8ba1dbe1fb25835670b..5e96eab7c8c29a223223d9f2967fbcec0aecb2df 100644 (file)
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.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-gnunet-namestore/

diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf
index 9ef8d067375db8dd9b786db776459ec41cd958e8..d437c2aa833330a54cea4d6cf157887ecdf2b52a 100644 (file)
--- a/src/statistics/test_statistics_api_data.conf
+++ b/src/statistics/test_statistics_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-gnunet-statistics/

diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index 89f16ed678d3356212a0ebd9eb1a31a036052e6b..04982984200009536cea79dd48778f3d29be3383 100644 (file)
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.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
 
 [testbed]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
index 9804f171e1a5fad8729898a88416a4cc87ac4ab3..e0ad5f8475366752cf3fdab2ce9cd35ccf20cb2e 100644 (file)
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
@@ -1,5 +1,5 @@
 @INLINE@ template_cfg_peer1.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 

diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
index 16dddf7443e21e32ead02d47ae07d57e2a87922c..bb466abbacca9b57b59f7c4624f9aeeb424f2b59 100644 (file)
--- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
+++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
@@ -1,5 +1,5 @@
 @INLINE@ template_cfg_peer2.conf
-@INLINE@ ../../contrib/no_autostart_above_core.conf
+@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/