fix

[oweals/gnunet.git] / src / datastore / perf_datastore_api.c

diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 23ff7c49a8e848fef8d1f61a3cfc53f5c6733079..61724e9643d896c9c4f178f40eafe6494beda388 100644 (file)
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -44,6 +44,7 @@
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
+static const char *plugin_name;
 
 static struct GNUNET_DATASTORE_Handle *datastore;
 
@@ -339,10 +340,11 @@ static int
 check ()
 {
   pid_t pid;
+  char cfg_name[128];
   char *const argv[] = { 
     "perf-datastore-api",
     "-c",
-    "test_datastore_api_data.conf",
+    cfg_name,
 #if VERBOSE
     "-L", "DEBUG",
 #endif
@@ -351,12 +353,17 @@ check ()
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
+
+  GNUNET_snprintf (cfg_name,
+                  sizeof (cfg_name),
+                  "test_datastore_api_data_%s.conf",
+                  plugin_name);
   pid = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                  "gnunet-service-arm",
 #if VERBOSE
                                  "-L", "DEBUG",
 #endif
-                                 "-c", "test_datastore_api_data.conf", NULL);
+                                 "-c", cfg_name, NULL);
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
                       argv, "perf-datastore-api", "nohelp",
                       options, &run, NULL);
@@ -374,8 +381,19 @@ int
 main (int argc, char *argv[])
 {
   int ret;
-
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-datastore");
+  const char *pos;
+  char dir_name[128];
+
+  /* determine name of plugin to use */
+  plugin_name = argv[0];
+  while (NULL != (pos = strstr(plugin_name, "_")))
+    plugin_name = pos+1;
+
+  GNUNET_snprintf (dir_name,
+                  sizeof (dir_name),
+                  "/tmp/test-gnunet-datastore-%s",
+                  plugin_name);
+  GNUNET_DISK_directory_remove (dir_name);
   GNUNET_log_setup ("perf-datastore-api",
 #if VERBOSE
                    "DEBUG",
@@ -387,9 +405,8 @@ main (int argc, char *argv[])
 #if REPORT_ID
   fprintf (stderr, "\n");
 #endif
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-datastore");
+  GNUNET_DISK_directory_remove (dir_name);
   return ret;
 }
 
-
 /* end of perf_datastore_api.c */