Fix hostkey loading for old testing framework

diff --git a/src/ats-test/test_transport_ats_1addr.conf b/src/ats-test/test_transport_ats_1addr.conf
index ab6e9cb5ae41e97153c16e367277afafc07fbe04..e01f743d270b6e7d7fb9af76d0bb97323b056dbb 100644 (file)
--- a/src/ats-test/test_transport_ats_1addr.conf
+++ b/src/ats-test/test_transport_ats_1addr.conf
@@ -4,7 +4,7 @@ SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data.conf
 
 [TESTING]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [nat]
 ALLOW_NAT = NO

diff --git a/src/ats-test/test_transport_ats_2addr.conf b/src/ats-test/test_transport_ats_2addr.conf
index 3b5a6a87a83b45d68f09722403a34c3b961ba8ac..ce7d104aecc37f0454917b63a5a76845fe42573f 100644 (file)
--- a/src/ats-test/test_transport_ats_2addr.conf
+++ b/src/ats-test/test_transport_ats_2addr.conf
@@ -4,7 +4,7 @@ SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data.conf
 
 [TESTING]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [transport-udp]
 PORT = 2571

diff --git a/src/ats-test/test_transport_ats_4addr.conf b/src/ats-test/test_transport_ats_4addr.conf
index 830cd881001120c9224bcf0eb77d348a985323fb..cd224e6b04fdd12a66ff060b588606bbdf4e4edd 100644 (file)
--- a/src/ats-test/test_transport_ats_4addr.conf
+++ b/src/ats-test/test_transport_ats_4addr.conf
@@ -4,7 +4,7 @@ SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data.conf
 
 [TESTING]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [nat]
 ALLOW_NAT = NO

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 459ebf376dd14bb1fe952dab23972d4dba522ee6..33d5a3624c6d57bcad4c1fbce0f217abdaafdd2e 100644 (file)
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -66,7 +66,7 @@ F2F = NO
 CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 06f9e46ef7cb6dde3d361761d1cd933e75fd67f9..e68e887c126c0368be2e1b4049819f8c3c081869 100644 (file)
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -61,7 +61,7 @@ PORT = 2094
 WEAKRANDOM = NO
 
 [testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey

diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 56c03f61a3a0c5e2c3395ece4d8875285e5a475d..884341dc71b4c4acad03c600ed6e9f17897a92b1 100644 (file)
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -66,7 +66,7 @@ F2F = NO
 CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s

diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index eae68f948419d29d4d654a1519af43821aa49cdf..790421c6908a99e0a30f3a037379c97b39f99ae2 100644 (file)
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -101,7 +101,7 @@ USE_PROGRESSBARS = YES
 #LOGNMODIFIER = .65
 #PERCENTAGE = .75
 NUM_PEERS = 10
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index cc47c6f36358dce6c7906e2b4f32ecdfb010b238..8ff7020475117ae2e973ad79a777db4d35059e9d 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -48,7 +48,7 @@ WEAKRANDOM = YES
 
 [testing_old]
 NUM_PEERS = 2
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 80eb8732924e3facb8cafdbfb011ca4c41647843..1078c369ff7e0791d9b543ad6e615183de0f3f86 100644 (file)
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -54,7 +54,7 @@ CONNECT_TOPOLOGY = LINE
 BLACKLIST_TOPOLOGY = LINE
 BLACKLIST_TRANSPORTS = tcp
 F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [fs]
 AUTOSTART = NO

diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index 671a43336e83b2a78de89891909dfa52a4b9cd22..e0e697ec71a139cd22180acb922015443cb4a8bf 100644 (file)
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -61,7 +61,7 @@ DELAY = YES
 WEAKRANDOM = YES
 
 [testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dhtcache]
 QUOTA=65536

diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf
index 1afd61ed7b570e6c36e34707992184ca96c51220..f2ce34e2b207e1592751cb6776072f6e5ee80b72 100644 (file)
--- a/src/gns/test_gns_defaults.conf
+++ b/src/gns/test_gns_defaults.conf
@@ -29,7 +29,7 @@ PORT = 2570
 NUM_PEERS = 5
 WEAKRANDOM = YES
 F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 9dd4a472b3f34cdf995d8b5a4acb5497ec01ca7f..8083b4ccc72cd0983a8eee0c34d15ec3682249ce 100644 (file)
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -12,7 +12,7 @@ ALLOW_SHUTDOWN = YES
 
 [testing]
 WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
 AUTOSTART = YES

diff --git a/src/integration-tests/test_connection_stability.conf b/src/integration-tests/test_connection_stability.conf
index b3845452ad0762febb8931e9a889805355de8951..a0400d81913cfda71a8311116c8ffbf254d171d7 100644 (file)
--- a/src/integration-tests/test_connection_stability.conf
+++ b/src/integration-tests/test_connection_stability.conf
@@ -32,7 +32,7 @@ WEAKRANDOM = YES
 [testing_old]
 NUM_PEERS = 5
 F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 5d91a8b43981b992070688950a2f18478204579c..e247f9f8c1b6c901000e484e4820ae4459644683 100644 (file)
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -77,7 +77,7 @@ F2F = NO
 CONNECT_TIMEOUT = 600 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s

diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 179264458559fe52f8cd71ff942a10ca1dbb588f..5d49443f0364d534ddcef5b35e77ae7bfc171379 100644 (file)
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -81,7 +81,7 @@ F2F = NO
 CONNECT_TIMEOUT = 660 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 4508e9ca7ac7f317769e88945deb1cd5a31df859..66075d7929fb2495f2db1e1f0844f0339d0dff56 100644 (file)
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -69,7 +69,7 @@ F2F = NO
 CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 #DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 1000 s

diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf
index 09929ca277294d7bbaba17cef0f614f3dcb96396..603a87a1c6ff5ef9e5bceaaea4edca009d0ea820 100644 (file)
--- a/src/stream/test_stream_local.conf
+++ b/src/stream/test_stream_local.conf
@@ -64,7 +64,7 @@ WEAKRANDOM = YES
 [testing_old]
 NUM_PEERS = 5
 DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s

diff --git a/src/testing/test_testing_defaults.conf b/src/testing/test_testing_defaults.conf
index 0705b2d15d4f4bc907b98761c8ac7eaf161ff036..80049ba4c25a7c02199956e3657cdd0060d9a242 100644 (file)
--- a/src/testing/test_testing_defaults.conf
+++ b/src/testing/test_testing_defaults.conf
@@ -33,7 +33,7 @@ PORT = 2570
 NUM_PEERS = 5
 WEAKRANDOM = YES
 F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

diff --git a/src/testing_old/test_testing_2dtorus.conf b/src/testing_old/test_testing_2dtorus.conf
index d69969f1abac949f7659c013cc4f1088172ca98a..69c59567d2080a67cfce6bd0abcd4c1f86c096b8 100644 (file)
--- a/src/testing_old/test_testing_2dtorus.conf
+++ b/src/testing_old/test_testing_2dtorus.conf
@@ -68,7 +68,7 @@ F2F = NO
 CONNECT_TIMEOUT = 600 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
 PEERGROUP_TIMEOUT = 2400 s

diff --git a/src/testing_old/test_testing_defaults.conf b/src/testing_old/test_testing_defaults.conf
index a89064f81371128df0f6de43c37a7d646da1117c..a28baa7be36fc1e7567f7e0e9a2a375d9e0a50aa 100644 (file)
--- a/src/testing_old/test_testing_defaults.conf
+++ b/src/testing_old/test_testing_defaults.conf
@@ -30,7 +30,7 @@ PORT = 2570
 NUM_PEERS = 5
 WEAKRANDOM = YES
 F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dht]
 AUTOSTART = NO

diff --git a/src/testing_old/testing_group.c b/src/testing_old/testing_group.c
index 62cc185ce9ea97ccc62d1583ad45dad27ac1b978..9191b9fdda0bd35e6852865c8fa4d8dde8e0c3c6 100644 (file)
--- a/src/testing_old/testing_group.c
+++ b/src/testing_old/testing_group.c
@@ -5940,9 +5940,26 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
       GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING_OLD", "HOSTKEYSFILE",
                                              &hostkeys_file))
   {
+    /* This is a hack to make old testing able to load keys from datadir,
+     * just as new testing does.
+     * No need to document it, just convert everything to the new testing
+     * framework...
+     */
+    char *DATADIR = "${DATADIR}";
+    size_t ddl = strlen (DATADIR);
+    if (strncmp (hostkeys_file, DATADIR, ddl) == 0)
+    {
+      char *data_dir;
+      char *filename;
+      data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+      GNUNET_asprintf (&filename, "%s%s", data_dir, &hostkeys_file[ddl]);
+      GNUNET_free (data_dir);
+      GNUNET_free (hostkeys_file);
+      hostkeys_file = filename;
+    }
     if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file))
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("Could not read hostkeys file!\n"));
+                  _("Could not read hostkeys file `%s'!\n"), hostkeys_file);
     else
     {
       /* Check hostkey file size, read entire thing into memory */

diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index d98dc9de731dcb3cf7e27138b79f6c75be6d2bc3..c4e01acedc3babd48cc21d40e8371605018bf0cd 100644 (file)
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -53,7 +53,7 @@ AUTOSTART = NO
 WEAKRANDOM = YES
 
 [testing_old]
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [dns]
 AUTOSTART = NO