summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-11-19 23:52:24 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2018-11-19 23:52:24 +0100
commitd3f73936ae5b5797531db8fe5e6b82cdd1e01ce3 (patch)
tree7e4e3640831ce105ecbcdee56078bdf4b08e9f68
parent368f3a9a6684dea78381c98ac9d217e9fc85e3b2 (diff)
downloadexchange-d3f73936ae5b5797531db8fe5e6b82cdd1e01ce3.tar.gz
exchange-d3f73936ae5b5797531db8fe5e6b82cdd1e01ce3.tar.bz2
exchange-d3f73936ae5b5797531db8fe5e6b82cdd1e01ce3.zip
Skip test when wire-plugin is not loaded.
-rw-r--r--src/wire-plugins/test_ebics_wireformat.c9
-rw-r--r--src/wire-plugins/test_wire_plugin.c8
-rw-r--r--src/wire/wire.c2
3 files changed, 15 insertions, 4 deletions
diff --git a/src/wire-plugins/test_ebics_wireformat.c b/src/wire-plugins/test_ebics_wireformat.c
index 46989d503..0d6b76ad0 100644
--- a/src/wire-plugins/test_ebics_wireformat.c
+++ b/src/wire-plugins/test_ebics_wireformat.c
@@ -51,7 +51,7 @@ main (int argc,
struct GNUNET_CONFIGURATION_Handle *cfg;
struct TALER_WIRE_Plugin *plugin;
- GNUNET_log_setup ("test-sepa-wireformats",
+ GNUNET_log_setup ("test-ebics-wireformats",
"WARNING",
NULL);
cfg = GNUNET_CONFIGURATION_create ();
@@ -61,7 +61,12 @@ main (int argc,
"EUR");
plugin = TALER_WIRE_plugin_load (cfg,
"ebics");
- GNUNET_assert (NULL != plugin);
+ if (NULL == plugin)
+ {
+ TALER_LOG_ERROR ("Could not load the ebics plugin\n");
+ return 77;
+ }
+
GNUNET_assert (TALER_EC_NONE !=
plugin->wire_validate (plugin->cls,
unsupported_wire_str));
diff --git a/src/wire-plugins/test_wire_plugin.c b/src/wire-plugins/test_wire_plugin.c
index 0bb7571f4..b29962b61 100644
--- a/src/wire-plugins/test_wire_plugin.c
+++ b/src/wire-plugins/test_wire_plugin.c
@@ -164,7 +164,13 @@ main (int argc,
test->currency);
plugin = TALER_WIRE_plugin_load (cfg,
test->plugin_name);
- GNUNET_assert (NULL != plugin);
+ if (NULL == plugin)
+ {
+ TALER_LOG_ERROR ("Could not load plugin `%s'\n",
+ test->plugin_name);
+ return 77;
+ }
+
ret = run_test (test, plugin);
TALER_WIRE_plugin_unload (plugin);
if (GNUNET_OK != ret)
diff --git a/src/wire/wire.c b/src/wire/wire.c
index aeb8689e6..60ae9e6ed 100644
--- a/src/wire/wire.c
+++ b/src/wire/wire.c
@@ -72,7 +72,7 @@ static struct WirePlugin *wp_tail;
*
* @param cfg configuration to use
* @param plugin_name name of the plugin to load
- * @return #GNUNET_OK on success
+ * @return the plugin object pointer, or NULL upon errors.
*/
struct TALER_WIRE_Plugin *
TALER_WIRE_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg,