diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-09-29 07:52:23 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-09-29 07:52:23 +0000 |
commit | cffbdaf5b9053fcf4266423b2167227523b082c4 (patch) | |
tree | d801c9ed0558a81e2006553916cc1247c20e5cef /src | |
parent | 8fb11120e2ac1773d07f5df4e2e299637c752338 (diff) | |
download | gnunet-cffbdaf5b9053fcf4266423b2167227523b082c4.tar.gz gnunet-cffbdaf5b9053fcf4266423b2167227523b082c4.zip |
report skipped tests, doxygen fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/datacache/perf_datacache.c | 3 | ||||
-rw-r--r-- | src/datacache/test_datacache.c | 3 | ||||
-rw-r--r-- | src/datastore/test_plugin_datastore.c | 10 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_store.c | 4 | ||||
-rw-r--r-- | src/nat/test_nat.c | 2 | ||||
-rw-r--r-- | src/util/common_allocation.c | 4 | ||||
-rw-r--r-- | src/util/perf_crypto_ecc_dlog.c | 2 |
7 files changed, 17 insertions, 11 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 | } |
diff --git a/src/datastore/test_plugin_datastore.c b/src/datastore/test_plugin_datastore.c index d60dc3cc2..a0e52416a 100644 --- a/src/datastore/test_plugin_datastore.c +++ b/src/datastore/test_plugin_datastore.c | |||
@@ -344,11 +344,14 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
344 | char *libname; | 344 | char *libname; |
345 | 345 | ||
346 | if (GNUNET_OK != | 346 | if (GNUNET_OK != |
347 | GNUNET_CONFIGURATION_get_value_string (cfg, "DATASTORE", "DATABASE", | 347 | GNUNET_CONFIGURATION_get_value_string (cfg, |
348 | "DATASTORE", | ||
349 | "DATABASE", | ||
348 | &name)) | 350 | &name)) |
349 | { | 351 | { |
350 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 352 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
351 | _("No `%s' specified for `%s' in configuration!\n"), "DATABASE", | 353 | _("No `%s' specified for `%s' in configuration!\n"), |
354 | "DATABASE", | ||
352 | "DATASTORE"); | 355 | "DATASTORE"); |
353 | return NULL; | 356 | return NULL; |
354 | } | 357 | } |
@@ -363,6 +366,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
363 | FPRINTF (stderr, "Failed to load plugin `%s'!\n", name); | 366 | FPRINTF (stderr, "Failed to load plugin `%s'!\n", name); |
364 | GNUNET_free (libname); | 367 | GNUNET_free (libname); |
365 | GNUNET_free (name); | 368 | GNUNET_free (name); |
369 | ok = 77; /* mark test as skipped */ | ||
366 | return NULL; | 370 | return NULL; |
367 | } | 371 | } |
368 | GNUNET_free (libname); | 372 | GNUNET_free (libname); |
@@ -420,7 +424,7 @@ main (int argc, char *argv[]) | |||
420 | "test_plugin_datastore_data_%s.conf", plugin_name); | 424 | "test_plugin_datastore_data_%s.conf", plugin_name); |
421 | GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, | 425 | GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv, |
422 | "test-plugin-datastore", "nohelp", options, &run, NULL); | 426 | "test-plugin-datastore", "nohelp", options, &run, NULL); |
423 | if (0 != ok) | 427 | if ( (0 != ok) && (77 != ok) ) |
424 | FPRINTF (stderr, "Missed some testcases: %u\n", ok); | 428 | FPRINTF (stderr, "Missed some testcases: %u\n", ok); |
425 | GNUNET_DISK_directory_remove (dir_name); | 429 | GNUNET_DISK_directory_remove (dir_name); |
426 | return ok; | 430 | return ok; |
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c index 378e734bb..9cc631c5e 100644 --- a/src/namestore/test_namestore_api_store.c +++ b/src/namestore/test_namestore_api_store.c | |||
@@ -171,8 +171,8 @@ main (int argc, char *argv[]) | |||
171 | } | 171 | } |
172 | if (NULL != directory) | 172 | if (NULL != directory) |
173 | { | 173 | { |
174 | GNUNET_DISK_directory_remove (directory); | 174 | GNUNET_DISK_directory_remove (directory); |
175 | GNUNET_free (directory); | 175 | GNUNET_free (directory); |
176 | } | 176 | } |
177 | return res; | 177 | return res; |
178 | } | 178 | } |
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c index b1d90ca31..4e097386a 100644 --- a/src/nat/test_nat.c +++ b/src/nat/test_nat.c | |||
@@ -128,7 +128,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
128 | { | 128 | { |
129 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 129 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
130 | "Could not find a valid interface address!\n"); | 130 | "Could not find a valid interface address!\n"); |
131 | exit (GNUNET_SYSERR); | 131 | exit (77); /* marks test as skipped */ |
132 | } | 132 | } |
133 | addr = data.addr; | 133 | addr = data.addr; |
134 | GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6); | 134 | GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6); |
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index cd7175eac..4ab5910eb 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -224,8 +224,8 @@ GNUNET_xrealloc_ (void *ptr, | |||
224 | * want to keep track of allocations. | 224 | * want to keep track of allocations. |
225 | * | 225 | * |
226 | * @param ptr the pointer to free | 226 | * @param ptr the pointer to free |
227 | * @param filename where in the code was the call to GNUNET_array_grow | 227 | * @param filename where in the code was the call to GNUNET_free |
228 | * @param linenumber where in the code was the call to GNUNET_array_grow | 228 | * @param linenumber where in the code was the call to GNUNET_free |
229 | */ | 229 | */ |
230 | void | 230 | void |
231 | GNUNET_xfree_ (void *ptr, | 231 | GNUNET_xfree_ (void *ptr, |
diff --git a/src/util/perf_crypto_ecc_dlog.c b/src/util/perf_crypto_ecc_dlog.c index ad83e1fbc..0db485576 100644 --- a/src/util/perf_crypto_ecc_dlog.c +++ b/src/util/perf_crypto_ecc_dlog.c | |||
@@ -170,4 +170,4 @@ main (int argc, char *argv[]) | |||
170 | return 0; | 170 | return 0; |
171 | } | 171 | } |
172 | 172 | ||
173 | /* end of test_crypto_ecc_dlog.c */ | 173 | /* end of perf_crypto_ecc_dlog.c */ |