denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conftest: Don't load plugins incrementally

Browse Source 
This is not supported by the plugin loader, so we simply combine the
plugin lists and load them all at once.
This commit is contained in:
Tobias Brunner
2013-09-13 11:44:04 +02:00
parent fafa768478
commit 11ac36b016
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conftest/conftest.c
+6 -4
View File
@@ -432,7 +432,7 @@ int main(int argc, char *argv[])
int status = 0; int status = 0;
sigset_t set; sigset_t set;
int sig; int sig;
char *suite_file = "suite.conf", *test_file = NULL; char *suite_file = "suite.conf", *test_file = NULL, *preload, *plugins;
file_logger_t *logger; file_logger_t *logger;
if (!library_init(NULL)) if (!library_init(NULL))
@@ -509,16 +509,18 @@ int main(int argc, char *argv[])
} }
load_loggers(logger); load_loggers(logger);
if (!lib->plugins->load(lib->plugins, preload = conftest->test->get_str(conftest->test, "preload", "");
conftest->test->get_str(conftest->test, "preload", ""))) if (asprintf(&plugins, "%s %s", preload, PLUGINS) < 0)
{ {
return 1; return 1;
} }
if (!charon->initialize(charon, PLUGINS)) if (!charon->initialize(charon, plugins))
{ {
free(plugins);
return 1; return 1;
} }
lib->plugins->status(lib->plugins, LEVEL_CTRL); lib->plugins->status(lib->plugins, LEVEL_CTRL);
free(plugins);
if (!load_certs(conftest->test, conftest->suite_dir)) if (!load_certs(conftest->test, conftest->suite_dir))
{ {