unit-tests: load plugins in test-runner from build directory

diff --git a/src/libstrongswan/tests/Makefile.am b/src/libstrongswan/tests/Makefile.am
index 44d797ef4115f65c03370192033bacee26e8880e..ca0a8c1ed87f20814180a99a445bdfd029b5e085 100644 (file)
--- a/src/libstrongswan/tests/Makefile.am
+++ b/src/libstrongswan/tests/Makefile.am
@@ -11,6 +11,7 @@ test_runner_SOURCES = \
 
 test_runner_CFLAGS = \
   -I$(top_srcdir)/src/libstrongswan \
+  -DPLUGINDIR=\""$(top_builddir)/src/libstrongswan/plugins\"" \
   -DPLUGINS=\""${s_plugins}\"" \
   @COVERAGE_CFLAGS@ \
   @CHECK_CFLAGS@

diff --git a/src/libstrongswan/tests/test_runner.c b/src/libstrongswan/tests/test_runner.c
index a30b1067d98d09fc0510f473131c534d69669bd6..c80f9fc2e501329994cca040861b9369ae11ff8f 100644 (file)
--- a/src/libstrongswan/tests/test_runner.c
+++ b/src/libstrongswan/tests/test_runner.c
@@ -20,6 +20,34 @@
 #include <library.h>
 #include <plugins/plugin_feature.h>
 
+#include <dirent.h>
+
+/**
+ * Load plugins from builddir
+ */
+static bool load_plugins()
+{
+       enumerator_t *enumerator;
+       char *name, path[PATH_MAX], dir[64];
+       bool success = TRUE;
+
+       enumerator = enumerator_create_token(PLUGINS, " ", "");
+       while (enumerator->enumerate(enumerator, &name))
+       {
+               snprintf(dir, sizeof(dir), "%s", name);
+               translate(dir, "-", "_");
+               snprintf(path, sizeof(path), "%s/%s/.libs", PLUGINDIR, dir);
+               if (!lib->plugins->load(lib->plugins, path, name))
+               {
+                       success = FALSE;
+                       break;
+               }
+       }
+       enumerator->destroy(enumerator);
+
+       return success;
+}
+
 int main()
 {
        SRunner *sr;
@@ -39,7 +67,7 @@ int main()
                        lib->settings->get_str(lib->settings,
                                "libstrongswan.plugins.random.urandom", "/dev/urandom"));
 
-       if (!lib->plugins->load(lib->plugins, NULL, PLUGINS))
+       if (!load_plugins())
        {
                library_deinit();
                return EXIT_FAILURE;