commit cffbdaf5b9053fcf4266423b2167227523b082c4
parent 8fb11120e2ac1773d07f5df4e2e299637c752338
Author: Christian Grothoff <christian@grothoff.org>
Date: Tue, 29 Sep 2015 07:52:23 +0000
report skipped tests, doxygen fixes
Diffstat:
7 files changed, 17 insertions(+), 11 deletions(-)
diff --git 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,
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;
}
diff --git 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,
FPRINTF (stderr,
"%s",
"Failed to initialize datacache. Database likely not setup, skipping test.\n");
+ ok = 77; /* mark test as skipped */
return;
}
exp = GNUNET_TIME_absolute_get ();
@@ -140,7 +141,7 @@ main (int argc, char *argv[])
plugin_name);
GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
"test-datacache", "nohelp", options, &run, NULL);
- if (0 != ok)
+ if ( (0 != ok) && (77 != ok) )
FPRINTF (stderr, "Missed some testcases: %d\n", ok);
return ok;
}
diff --git 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)
char *libname;
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "DATASTORE", "DATABASE",
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "DATASTORE",
+ "DATABASE",
&name))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("No `%s' specified for `%s' in configuration!\n"), "DATABASE",
+ _("No `%s' specified for `%s' in configuration!\n"),
+ "DATABASE",
"DATASTORE");
return NULL;
}
@@ -363,6 +366,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg)
FPRINTF (stderr, "Failed to load plugin `%s'!\n", name);
GNUNET_free (libname);
GNUNET_free (name);
+ ok = 77; /* mark test as skipped */
return NULL;
}
GNUNET_free (libname);
@@ -420,7 +424,7 @@ main (int argc, char *argv[])
"test_plugin_datastore_data_%s.conf", plugin_name);
GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
"test-plugin-datastore", "nohelp", options, &run, NULL);
- if (0 != ok)
+ if ( (0 != ok) && (77 != ok) )
FPRINTF (stderr, "Missed some testcases: %u\n", ok);
GNUNET_DISK_directory_remove (dir_name);
return ok;
diff --git 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[])
}
if (NULL != directory)
{
- GNUNET_DISK_directory_remove (directory);
- GNUNET_free (directory);
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
}
return res;
}
diff --git 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,
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not find a valid interface address!\n");
- exit (GNUNET_SYSERR);
+ exit (77); /* marks test as skipped */
}
addr = data.addr;
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
@@ -224,8 +224,8 @@ GNUNET_xrealloc_ (void *ptr,
* want to keep track of allocations.
*
* @param ptr the pointer to free
- * @param filename where in the code was the call to GNUNET_array_grow
- * @param linenumber where in the code was the call to GNUNET_array_grow
+ * @param filename where in the code was the call to GNUNET_free
+ * @param linenumber where in the code was the call to GNUNET_free
*/
void
GNUNET_xfree_ (void *ptr,
diff --git 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[])
return 0;
}
-/* end of test_crypto_ecc_dlog.c */
+/* end of perf_crypto_ecc_dlog.c */
