ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

vici: Make unit-tests independent from libcharon and libhydra 

Fixes monolithic build, as we can't depend on the not yet built libcharon.
This commit is contained in:
Martin Willi 2014-04-03 16:41:45 +02:00
parent 0963a9952c
commit 93d60c479a
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcharon/plugins/vici/Makefile.am
View File

@ -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

1
src/libcharon/plugins/vici/vici_socket.c
View File

@ -15,7 +15,6 @@
#include "vici_socket.h"
#include <daemon.h>
#include <threading/mutex.h>
#include <threading/condvar.h>
#include <threading/thread.h>

9
src/libcharon/plugins/vici/vici_tests.c
View File

@ -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;
}