[GNUnet-SVN] r12527 - gnunet/src/datacache

[gnunet]

Author: grothoff
Date: 2010-08-14 16:55:23 +0200 (Sat, 14 Aug 2010)
New Revision: 12527

Modified:
   gnunet/src/datacache/perf_datacache.c
   gnunet/src/datacache/test_datacache.c
   gnunet/src/datacache/test_datacache_quota.c
Log:
tolerate missing DB setup

Modified: gnunet/src/datacache/perf_datacache.c
===================================================================
--- gnunet/src/datacache/perf_datacache.c       2010-08-14 13:44:17 UTC (rev 
12526)
+++ gnunet/src/datacache/perf_datacache.c       2010-08-14 14:55:23 UTC (rev 
12527)
@@ -76,7 +76,12 @@
                               cfg,
                               "perfcache");
 
-  ASSERT (NULL != h);
+  if (h == NULL)
+    {
+      fprintf (stderr,
+              "Failed to initialize datacache.  Database likely not setup, 
skipping test.\n");
+      return;
+    }
   exp = GNUNET_TIME_absolute_get ();
   start = exp;
   exp.value += 5 * 60 * 1000;

Modified: gnunet/src/datacache/test_datacache.c
===================================================================
--- gnunet/src/datacache/test_datacache.c       2010-08-14 13:44:17 UTC (rev 
12526)
+++ gnunet/src/datacache/test_datacache.c       2010-08-14 14:55:23 UTC (rev 
12527)
@@ -77,8 +77,12 @@
   h = GNUNET_DATACACHE_create (sched,
                               cfg,
                               "testcache");
-
-  ASSERT (NULL != h);
+  if (h == NULL)
+    {
+      fprintf (stderr,
+              "Failed to initialize datacache.  Database likely not setup, 
skipping test.\n");
+      return;
+    }
   exp = GNUNET_TIME_absolute_get ();
   exp.value += 5 * 60 * 1000;
   memset (&k, 0, sizeof (GNUNET_HashCode));

Modified: gnunet/src/datacache/test_datacache_quota.c
===================================================================
--- gnunet/src/datacache/test_datacache_quota.c 2010-08-14 13:44:17 UTC (rev 
12526)
+++ gnunet/src/datacache/test_datacache_quota.c 2010-08-14 14:55:23 UTC (rev 
12527)
@@ -63,7 +63,12 @@
                               cfg,
                               "testcache");
 
-  ASSERT (NULL != h);
+  if (h == NULL)
+    {
+      fprintf (stderr,
+              "Failed to initialize datacache.  Database likely not setup, 
skipping test.\n");
+      return;
+    }
   exp = GNUNET_TIME_absolute_get ();
   exp.value += 20 * 60 * 1000;
   memset (buf, 1, sizeof (buf));