diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:39:27 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-03-03 17:39:58 +0100 |
| commit | 88ce12a927f03d88f29609a46e7880dc0ecfb8be (patch) | |
| tree | 7966167225b3e6f2ac51554f6092a28ab132c2b0 /src/libcharon/tests | |
| parent | 91d80298f9de5e7d792b7cb0a6c7a2c61784d744 (diff) | |
| parent | 28649f6d91971e0fe50078aec2937010e8c61cd8 (diff) | |
| download | strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.bz2 strongswan-88ce12a927f03d88f29609a46e7880dc0ecfb8be.tar.xz | |
Merge branch 'libhydra-bye-bye'
Moves kernel plugins to libcharon and removes the unused libhydra. The
kernel interface is now accessible under charon->kernel.
Diffstat (limited to 'src/libcharon/tests')
| -rw-r--r-- | src/libcharon/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libcharon/tests/libcharon_tests.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/libcharon/tests/Makefile.am b/src/libcharon/tests/Makefile.am index 5fd8ca26d..0589269aa 100644 --- a/src/libcharon/tests/Makefile.am +++ b/src/libcharon/tests/Makefile.am @@ -10,7 +10,6 @@ libcharon_tests_SOURCES = \ libcharon_tests_CFLAGS = \ -I$(top_srcdir)/src/libcharon \ - -I$(top_srcdir)/src/libhydra \ -I$(top_srcdir)/src/libstrongswan \ -I$(top_srcdir)/src/libstrongswan/tests \ -DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \ @@ -20,6 +19,5 @@ libcharon_tests_CFLAGS = \ libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@ libcharon_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/tests/libcharon_tests.c b/src/libcharon/tests/libcharon_tests.c index ec96de711..4692c3094 100644 --- a/src/libcharon/tests/libcharon_tests.c +++ b/src/libcharon/tests/libcharon_tests.c @@ -14,7 +14,6 @@ */ #include <test_runner.h> -#include <hydra.h> #include <daemon.h> /* declare test suite constructors */ @@ -39,7 +38,6 @@ static bool test_runner_init(bool init) { char *plugins, *plugindir; - libhydra_init(); libcharon_init(); plugins = getenv("TESTS_PLUGINS") ?: @@ -59,7 +57,6 @@ static bool test_runner_init(bool init) lib->processor->cancel(lib->processor); lib->plugins->unload(lib->plugins); libcharon_deinit(); - libhydra_deinit(); } return TRUE; } |