unit-tests: Load libstrongswan plugins in libcharon tests

This commit is contained in:
Martin Willi 2015-04-27 13:06:39 +02:00
parent fe5d6eaa9f
commit 88d90c7b4b
2 changed files with 16 additions and 0 deletions

View File

@ -11,6 +11,8 @@ libcharon_tests_CFLAGS = \
-I$(top_srcdir)/src/libhydra \ -I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/tests \ -I$(top_srcdir)/src/libstrongswan/tests \
-DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
-DPLUGINS=\""${s_plugins}\"" \
@COVERAGE_CFLAGS@ @COVERAGE_CFLAGS@
libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@ libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@

View File

@ -37,13 +37,27 @@ static bool test_runner_init(bool init)
{ {
if (init) if (init)
{ {
char *plugins, *plugindir;
libhydra_init(); libhydra_init();
libcharon_init(); libcharon_init();
plugins = getenv("TESTS_PLUGINS") ?:
lib->settings->get_str(lib->settings,
"tests.load", PLUGINS);
plugindir = lib->settings->get_str(lib->settings,
"tests.plugindir", PLUGINDIR);
plugin_loader_add_plugindirs(plugindir, plugins);
if (!lib->plugins->load(lib->plugins, plugins))
{
return FALSE;
}
} }
else else
{ {
lib->processor->set_threads(lib->processor, 0); lib->processor->set_threads(lib->processor, 0);
lib->processor->cancel(lib->processor); lib->processor->cancel(lib->processor);
lib->plugins->unload(lib->plugins);
libcharon_deinit(); libcharon_deinit();
libhydra_deinit(); libhydra_deinit();
} }