From 93d60c479a343e3451a8f61a043e3a4fe8d0c027 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Thu, 3 Apr 2014 16:41:45 +0200
Subject: [PATCH] vici: Make unit-tests independent from libcharon and libhydra

Fixes monolithic build, as we can't depend on the not yet built libcharon.
---
 src/libcharon/plugins/vici/Makefile.am   | 2 --
 src/libcharon/plugins/vici/vici_socket.c | 1 -
 src/libcharon/plugins/vici/vici_tests.c  | 9 +--------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/libcharon/plugins/vici/Makefile.am b/src/libcharon/plugins/vici/Makefile.am
index 370f8c58b..df241dcab 100644
--- 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 fa44c7061..5a0fc81ec 100644
--- 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 ec5afa45d..434aa5e18 100644
--- 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;
 }