tolerate missing DB setup

3 files changed, 18 insertions, 4 deletions

diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index e2eb474d4..10efa5eee 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -76,7 +76,12 @@ run (void *cls,
                                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;
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index c5acf365a..0c9399aff 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -77,8 +77,12 @@ run (void *cls,
   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));
diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index 9028196bd..ada5ae171 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -63,7 +63,12 @@ run (void *cls,
                                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));