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

tests: Properly load plugins from build directory

Browse Source 
Calling load() incrementally does not really work as dependencies
wouldn't be resolved properly if a required feature was to be provided
by a plugin that is loaded later with a separate call to load().
This commit is contained in:
Tobias Brunner
2013-06-27 11:06:47 +02:00
parent f2086e42ff
commit 65d23c7c90
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/test_runner.c
+2 -7
View File
@@ -29,7 +29,6 @@ static bool load_plugins()
{ {
enumerator_t *enumerator; enumerator_t *enumerator;
char *name, path[PATH_MAX], dir[64]; char *name, path[PATH_MAX], dir[64];
bool success = TRUE;
enumerator = enumerator_create_token(PLUGINS, " ", ""); enumerator = enumerator_create_token(PLUGINS, " ", "");
while (enumerator->enumerate(enumerator, &name)) while (enumerator->enumerate(enumerator, &name))
@@ -37,15 +36,11 @@ static bool load_plugins()
snprintf(dir, sizeof(dir), "%s", name); snprintf(dir, sizeof(dir), "%s", name);
translate(dir, "-", "_"); translate(dir, "-", "_");
snprintf(path, sizeof(path), "%s/%s/.libs", PLUGINDIR, dir); snprintf(path, sizeof(path), "%s/%s/.libs", PLUGINDIR, dir);
if (!lib->plugins->load(lib->plugins, path, name)) lib->plugins->add_path(lib->plugins, path);
{
success = FALSE;
break;
}
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
return success; return lib->plugins->load(lib->plugins, NULL, PLUGINS);
} }
int main() int main()