[GNUnet-SVN] r30265 - in gnunet/src: testbed testing

[gnunet]

Author: harsha
Date: 2013-10-17 17:24:06 +0200 (Thu, 17 Oct 2013)
New Revision: 30265

Modified:
   gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c
   gnunet/src/testbed/gnunet-helper-testbed.c
   gnunet/src/testbed/test_testbed_logger_api.c
   gnunet/src/testbed/testbed_api_hosts.c
   gnunet/src/testbed/testbed_api_testbed.c
   gnunet/src/testing/testing.c
Log:
- use get_value_filename when retrieving filenames and paths


Modified: gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c
===================================================================
--- gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c        2013-10-17 
15:22:51 UTC (rev 30264)
+++ gnunet/src/testbed/gnunet-daemon-testbed-blacklist.c        2013-10-17 
15:24:06 UTC (rev 30265)
@@ -214,9 +214,9 @@
   char *shome;
   char fname[PATH_MAX];
 
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (c, "PATHS",
-                                                          "GNUNET_HOME",
-                                                          &shome))
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c, "PATHS",
+                                                            "GNUNET_HOME",
+                                                            &shome))
   {
     GNUNET_break (0);
     return;

Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c  2013-10-17 15:22:51 UTC (rev 
30264)
+++ gnunet/src/testbed/gnunet-helper-testbed.c  2013-10-17 15:24:06 UTC (rev 
30265)
@@ -431,7 +431,7 @@
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_TESTING_configuration_create (test_system, cfg));
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS",
+                 GNUNET_CONFIGURATION_get_value_filename (cfg, "PATHS",
                                                         "DEFAULTCONFIG",
                                                         &config));
   if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config))

Modified: gnunet/src/testbed/test_testbed_logger_api.c
===================================================================
--- gnunet/src/testbed/test_testbed_logger_api.c        2013-10-17 15:22:51 UTC 
(rev 30264)
+++ gnunet/src/testbed/test_testbed_logger_api.c        2013-10-17 15:24:06 UTC 
(rev 30265)
@@ -203,9 +203,8 @@
            struct GNUNET_TESTING_Peer *p)
 {
   FAIL_TEST (NULL != (h = GNUNET_TESTBED_LOGGER_connect (cfg)), return);
-  FAIL_TEST (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string
+  FAIL_TEST (GNUNET_OK == GNUNET_CONFIGURATION_get_value_filename
              (cfg, "testbed-logger", "dir", &search_dir), return);
-  search_dir = GNUNET_CONFIGURATION_expand_dollar (cfg, search_dir);
   peer = p;
   write_task = GNUNET_SCHEDULER_add_now (&do_write, NULL);
   abort_task = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (10),

Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c      2013-10-17 15:22:51 UTC (rev 
30264)
+++ gnunet/src/testbed/testbed_api_hosts.c      2013-10-17 15:24:06 UTC (rev 
30265)
@@ -1102,7 +1102,7 @@
     GNUNET_asprintf (&port, "%u", host->port);
     LOG_DEBUG ("Starting remote connection to destination %s\n", hostname);
     if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (cfg, "testbed",
+        GNUNET_CONFIGURATION_get_value_filename (cfg, "testbed",
                                                "HELPER_BINARY_PATH",
                                                &helper_binary_path_args[0]))
       helper_binary_path_args[0] =
@@ -1330,7 +1330,7 @@
   h->host = host;
   hostname = (NULL == host->hostname) ? "127.0.0.1" : host->hostname;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_string (config, "testbed",
+      GNUNET_CONFIGURATION_get_value_filename (config, "testbed",
                                              "HELPER_BINARY_PATH",
                                              &stat_args[1]))
     stat_args[1] =

Modified: gnunet/src/testbed/testbed_api_testbed.c
===================================================================
--- gnunet/src/testbed/testbed_api_testbed.c    2013-10-17 15:22:51 UTC (rev 
30264)
+++ gnunet/src/testbed/testbed_api_testbed.c    2013-10-17 15:24:06 UTC (rev 
30265)
@@ -1326,7 +1326,7 @@
     break;
   case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
     if (GNUNET_OK !=
-        GNUNET_CONFIGURATION_get_value_string (rc->cfg, TESTBED_CONFIG_SECTION,
+        GNUNET_CONFIGURATION_get_value_filename (rc->cfg, 
TESTBED_CONFIG_SECTION,
                                                "OVERLAY_TOPOLOGY_FILE",
                                                &rc->topo_file))
     {

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2013-10-17 15:22:51 UTC (rev 30264)
+++ gnunet/src/testing/testing.c        2013-10-17 15:24:06 UTC (rev 30265)
@@ -1227,7 +1227,7 @@
       goto err_ret;
   }
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_string
+                 GNUNET_CONFIGURATION_get_value_filename
                  (cfg, "PATHS", "DEFAULTCONFIG", &config_filename));
   if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename))
   {