vici: Make unit-tests independent from libcharon and libhydra

Fixes monolithic build, as we can't depend on the not yet built libcharon.

diff --git a/src/libcharon/plugins/vici/Makefile.am b/src/libcharon/plugins/vici/Makefile.am
index 370f8c58bc51014ea51dee4d878490de79c4bf3d..df241dcab40b24424bd62866ea8f5a509da5e8b3 100644 (file)
--- a/src/libcharon/plugins/vici/Makefile.am
+++ b/src/libcharon/plugins/vici/Makefile.am
@@ -61,7 +61,5 @@ vici_tests_CFLAGS = \
 
 vici_tests_LDFLAGS = @COVERAGE_LDFLAGS@
 vici_tests_LDADD = \
-       $(top_builddir)/src/libcharon/libcharon.la \
-       $(top_builddir)/src/libhydra/libhydra.la \
        $(top_builddir)/src/libstrongswan/libstrongswan.la \
        $(top_builddir)/src/libstrongswan/tests/libtest.la

diff --git a/src/libcharon/plugins/vici/vici_socket.c b/src/libcharon/plugins/vici/vici_socket.c
index fa44c706172780b7a8c4b80fcf96fc1c2c779705..5a0fc81ece097ba162ea6779a7e3bb3611a94036 100644 (file)
--- a/src/libcharon/plugins/vici/vici_socket.c
+++ b/src/libcharon/plugins/vici/vici_socket.c
@@ -15,7 +15,6 @@
 
 #include "vici_socket.h"
 
-#include <daemon.h>
 #include <threading/mutex.h>
 #include <threading/condvar.h>
 #include <threading/thread.h>

diff --git a/src/libcharon/plugins/vici/vici_tests.c b/src/libcharon/plugins/vici/vici_tests.c
index ec5afa45dfe0078d79ae86ac47b7e1facbbd4678..434aa5e1853394999891ba7e8f935f9043346ae7 100644 (file)
--- a/src/libcharon/plugins/vici/vici_tests.c
+++ b/src/libcharon/plugins/vici/vici_tests.c
@@ -32,17 +32,10 @@ static test_configuration_t tests[] = {
 
 static bool test_runner_init(bool init)
 {
-       if (init)
-       {
-               libhydra_init("vici-tests");
-               libcharon_init("vici-tests");
-       }
-       else
+       if (!init)
        {
                lib->processor->set_threads(lib->processor, 0);
                lib->processor->cancel(lib->processor);
-               libcharon_deinit();
-               libhydra_deinit();
        }
        return TRUE;
 }