-fix ftbfs

[oweals/gnunet.git] / src / namestore / test_namestore_api_lookup_nick.c

diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c
index c9a1c5f19e6df8853ac071816806311a9e952ccb..af590aece093e57d609d130b11515b2d3051dbac 100644 (file)
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -37,7 +37,7 @@
 
 static struct GNUNET_NAMESTORE_Handle *nsh;
 
-static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+static struct GNUNET_SCHEDULER_Task * endbadly_task;
 
 static struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
 
@@ -52,6 +52,8 @@ static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 //static const char * name = "dummy.dummy.gnunet";
 static const char * name = "d";
 
+static char *directory;
+
 static void
 cleanup ()
 {
@@ -150,7 +152,7 @@ void lookup_it (void *cls,
         endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL );
         return;
       }
-      if (rd[c].flags != GNUNET_GNSRECORD_RF_PRIVATE)
+      if (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE))
       {
         GNUNET_break(0);
         GNUNET_SCHEDULER_cancel (endbadly_task);
@@ -204,14 +206,14 @@ void lookup_it (void *cls,
   if ((GNUNET_YES == found_nick) && (GNUNET_YES == found_record))
   {
     GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+    endbadly_task = NULL;
     GNUNET_SCHEDULER_add_now (&end, NULL );
   }
   else
   {
     GNUNET_break (0);
     GNUNET_SCHEDULER_cancel (endbadly_task);
-    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+    endbadly_task = NULL;
     GNUNET_SCHEDULER_add_now (&endbadly, NULL );
   }
 }
@@ -267,6 +269,11 @@ run (void *cls,
 {
   char *hostkey_file;
 
+  directory = NULL;
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory));
+  GNUNET_DISK_directory_remove (directory);
+
   endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                                &endbadly, NULL);
   GNUNET_asprintf (&hostkey_file,
@@ -300,7 +307,14 @@ main (int argc, char *argv[])
                                "test_namestore_api.conf",
                                &run,
                                NULL))
-    return 1;
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }