aboutsummaryrefslogtreecommitdiff
path: root/src/datacache
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-09-29 07:52:23 +0000
committerChristian Grothoff <christian@grothoff.org>2015-09-29 07:52:23 +0000
commitcffbdaf5b9053fcf4266423b2167227523b082c4 (patch)
treed801c9ed0558a81e2006553916cc1247c20e5cef /src/datacache
parent8fb11120e2ac1773d07f5df4e2e299637c752338 (diff)
downloadgnunet-cffbdaf5b9053fcf4266423b2167227523b082c4.tar.gz
gnunet-cffbdaf5b9053fcf4266423b2167227523b082c4.zip
report skipped tests, doxygen fixes
Diffstat (limited to 'src/datacache')
-rw-r--r--src/datacache/perf_datacache.c3
-rw-r--r--src/datacache/test_datacache.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 3750b9256..5c08cea95 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -75,6 +75,7 @@ run (void *cls, char *const *args, const char *cfgfile,
75 if (h == NULL) 75 if (h == NULL)
76 { 76 {
77 FPRINTF (stderr, "%s", "Failed to initialize datacache. Database likely not setup, skipping test.\n"); 77 FPRINTF (stderr, "%s", "Failed to initialize datacache. Database likely not setup, skipping test.\n");
78 ok = 77; /* mark test as skipped */
78 return; 79 return;
79 } 80 }
80 exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS); 81 exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
@@ -150,7 +151,7 @@ main (int argc, char *argv[])
150 plugin_name); 151 plugin_name);
151 GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, 152 GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
152 "perf-datacache", "nohelp", options, &run, NULL); 153 "perf-datacache", "nohelp", options, &run, NULL);
153 if (ok != 0) 154 if ( (0 != ok) && (77 != ok) )
154 FPRINTF (stderr, "Missed some perfcases: %d\n", ok); 155 FPRINTF (stderr, "Missed some perfcases: %d\n", ok);
155 return ok; 156 return ok;
156} 157}
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index 726378aa3..ddddf0008 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -77,6 +77,7 @@ run (void *cls, char *const *args, const char *cfgfile,
77 FPRINTF (stderr, 77 FPRINTF (stderr,
78 "%s", 78 "%s",
79 "Failed to initialize datacache. Database likely not setup, skipping test.\n"); 79 "Failed to initialize datacache. Database likely not setup, skipping test.\n");
80 ok = 77; /* mark test as skipped */
80 return; 81 return;
81 } 82 }
82 exp = GNUNET_TIME_absolute_get (); 83 exp = GNUNET_TIME_absolute_get ();
@@ -140,7 +141,7 @@ main (int argc, char *argv[])
140 plugin_name); 141 plugin_name);
141 GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, 142 GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
142 "test-datacache", "nohelp", options, &run, NULL); 143 "test-datacache", "nohelp", options, &run, NULL);
143 if (0 != ok) 144 if ( (0 != ok) && (77 != ok) )
144 FPRINTF (stderr, "Missed some testcases: %d\n", ok); 145 FPRINTF (stderr, "Missed some testcases: %d\n", ok);
145 return ok; 146 return ok;
146} 147}