1 files changed, 31 insertions, 64 deletions

diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c
index 16fe40c..adfacef 100644
--- a/src/datastore/test_plugin_datastore.c
+++ b/src/datastore/test_plugin_datastore.c
@@ -27,8 +27,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
 #include "gnunet_datastore_plugin.h"
-
-#define VERBOSE GNUNET_NO
+#include "gnunet_testing_lib.h"
 
 /**
  * Number of put operations to perform.
@@ -85,11 +84,11 @@ disk_utilization_change_cb (void *cls, int delta)
 
 
 static void
-gen_key (int i, GNUNET_HashCode * key)
+gen_key (int i, struct GNUNET_HashCode * key)
 {
-  memset (key, 0, sizeof (GNUNET_HashCode));
+  memset (key, 0, sizeof (struct GNUNET_HashCode));
   key->bits[0] = (unsigned int) i;
-  GNUNET_CRYPTO_hash (key, sizeof (GNUNET_HashCode), key);
+  GNUNET_CRYPTO_hash (key, sizeof (struct GNUNET_HashCode), key);
 }
 
 
@@ -98,7 +97,7 @@ put_value (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k)
 {
   char value[65536];
   size_t size;
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
   char *msg;
   unsigned int prio;
 
@@ -117,10 +116,9 @@ put_value (struct GNUNET_DATASTORE_PluginFunctions *api, int i, int k)
   value[0] = k;
   msg = NULL;
   prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 100);
-#if VERBOSE
-  FPRINTF (stderr, "putting type %u, anon %u under key %s\n", i + 1, i,
-           GNUNET_h2s (&key));
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "putting type %u, anon %u under key %s\n", i + 1, i,
+	      GNUNET_h2s (&key));
   if (GNUNET_OK != api->put (api->cls, &key, size, value, i + 1 /* type */ ,
                              prio, i /* anonymity */ ,
                              0 /* replication */ ,
@@ -149,7 +147,7 @@ static uint64_t guid;
 
 
 static int
-iterate_one_shot (void *cls, const GNUNET_HashCode * key, uint32_t size,
+iterate_one_shot (void *cls, const struct GNUNET_HashCode * key, uint32_t size,
                   const void *data, enum GNUNET_BLOCK_Type type,
                   uint32_t priority, uint32_t anonymity,
                   struct GNUNET_TIME_Absolute expiration, uint64_t uid)
@@ -159,12 +157,10 @@ iterate_one_shot (void *cls, const GNUNET_HashCode * key, uint32_t size,
   GNUNET_assert (key != NULL);
   guid = uid;
   crc->phase++;
-#if VERBOSE
-  FPRINTF (stderr,
-           "Found result type=%u, priority=%u, size=%u, expire=%llu, key %s\n",
-           type, priority, size, (unsigned long long) expiration.abs_value,
-           GNUNET_h2s (key));
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Found result type=%u, priority=%u, size=%u, expire=%llu, key %s\n",
+	      type, priority, size, (unsigned long long) expiration.abs_value,
+	      GNUNET_h2s (key));
   GNUNET_SCHEDULER_add_now (&test, crc);
   return GNUNET_OK;
 }
@@ -222,16 +218,15 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   int j;
   unsigned long long os;
   unsigned long long cs;
-  GNUNET_HashCode key;
+  struct GNUNET_HashCode key;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test aborted.\n");
     crc->phase = RP_ERROR;
   }
-#if VERBOSE
-  FPRINTF (stderr, "In phase %d, iteration %u\n", crc->phase, crc->cnt);
-#endif
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+	      "In phase %d, iteration %u\n", crc->phase, crc->cnt);
   switch (crc->phase)
   {
   case RP_ERROR:
@@ -325,6 +320,8 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
   if (NULL == (ret = GNUNET_PLUGIN_load (libname, &env)))
   {
     FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
+    GNUNET_free (libname);
+    GNUNET_free (name);
     return NULL;
   }
   GNUNET_free (libname);
@@ -355,67 +352,37 @@ run (void *cls, char *const *args, const char *cfgfile,
 }
 
 
-static int
-check ()
+int
+main (int argc, char *argv[])
 {
+  char dir_name[128];
   char cfg_name[128];
-
-  char *const argv[] = {
+  char *const xargv[] = {
     "test-plugin-datastore",
     "-c",
     cfg_name,
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
 
-  GNUNET_snprintf (cfg_name, sizeof (cfg_name),
-                   "test_plugin_datastore_data_%s.conf", plugin_name);
-  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                      "test-plugin-datastore", "nohelp", options, &run, NULL);
-  if (ok != 0)
-    FPRINTF (stderr, "Missed some testcases: %u\n", ok);
-  return ok;
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int ret;
-  char *pos;
-  char dir_name[128];
-
-  sleep (1);
   /* determine name of plugin to use */
-  plugin_name = argv[0];
-  while (NULL != (pos = strstr (plugin_name, "_")))
-    plugin_name = pos + 1;
-  if (NULL != (pos = strstr (plugin_name, ".")))
-    pos[0] = 0;
-  else
-    pos = (char *) plugin_name;
-
+  plugin_name = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
   GNUNET_snprintf (dir_name, sizeof (dir_name),
                    "/tmp/test-gnunet-datastore-plugin-%s", plugin_name);
   GNUNET_DISK_directory_remove (dir_name);
   GNUNET_log_setup ("test-plugin-datastore",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
-  ret = check ();
-  if (pos != plugin_name)
-    pos[0] = '.';
+  GNUNET_snprintf (cfg_name, sizeof (cfg_name),
+                   "test_plugin_datastore_data_%s.conf", plugin_name);
+  GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
+                      "test-plugin-datastore", "nohelp", options, &run, NULL);
+  if (0 != ok)
+    FPRINTF (stderr, "Missed some testcases: %u\n", ok);
   GNUNET_DISK_directory_remove (dir_name);
-
-  return ret;
+  return ok;
 }
 
 /* end of test_plugin_datastore.c */