Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials

[oweals/gnunet.git] / src / datacache / perf_datacache.c

diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 027999d224d814ce0468599a50825e4f7db2d7b1..b01b9f9c492553f9719fda6dade11bb11fce8730 100644 (file)
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2006, 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2006, 2009, 2010 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /*
  * @file datacache/perf_datacache.c
@@ -44,7 +44,7 @@ static const char *plugin_name;
 
 
 static int
-checkIt (void *cls, 
+checkIt (void *cls,
          const struct GNUNET_HashCode * key, size_t size, const char *data,
          enum GNUNET_BLOCK_Type type,
         struct GNUNET_TIME_Absolute exp,
@@ -75,6 +75,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   if (h == NULL)
   {
     FPRINTF (stderr, "%s", "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
+    ok = 77; /* mark test as skipped */
     return;
   }
   exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
@@ -150,7 +151,7 @@ main (int argc, char *argv[])
                    plugin_name);
   GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
                       "perf-datacache", "nohelp", options, &run, NULL);
-  if (ok != 0)
+  if ( (0 != ok) && (77 != ok) )
     FPRINTF (stderr, "Missed some perfcases: %d\n", ok);
   return ok;
 }