libcharon: Add a test runner

diff --git a/configure.ac b/configure.ac
index b0c3499..9e33906 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1750,6 +1750,7 @@ AC_CONFIG_FILES([
        src/libcharon/plugins/resolve/Makefile
        src/libcharon/plugins/attr/Makefile
        src/libcharon/plugins/attr_sql/Makefile
+       src/libcharon/tests/Makefile
        src/stroke/Makefile
        src/ipsec/Makefile
        src/starter/Makefile

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 0384064..7b9a775 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -651,3 +651,8 @@ if MONOLITHIC
   libcharon_la_LIBADD += plugins/attr_sql/libstrongswan-attr-sql.la
 endif
 endif
+
+if MONOLITHIC
+  SUBDIRS += .
+endif
+SUBDIRS += tests

diff --git a/src/libcharon/tests/.gitignore b/src/libcharon/tests/.gitignore
new file mode 100644 (file)
index 0000000..a4db86a
--- /dev/null
+++ b/src/libcharon/tests/.gitignore
@@ -0,0 +1 @@
+libcharon_tests

diff --git a/src/libcharon/tests/Makefile.am b/src/libcharon/tests/Makefile.am
new file mode 100644 (file)
index 0000000..317e019
--- /dev/null
+++ b/src/libcharon/tests/Makefile.am
@@ -0,0 +1,20 @@
+TESTS = libcharon_tests
+
+check_PROGRAMS = $(TESTS)
+
+libcharon_tests_SOURCES = \
+  libcharon_tests.h libcharon_tests.c
+
+libcharon_tests_CFLAGS = \
+  -I$(top_srcdir)/src/libcharon \
+  -I$(top_srcdir)/src/libhydra \
+  -I$(top_srcdir)/src/libstrongswan \
+  -I$(top_srcdir)/src/libstrongswan/tests \
+  @COVERAGE_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
new file mode 100644 (file)
index 0000000..1ed0f0c
--- /dev/null
+++ b/src/libcharon/tests/libcharon_tests.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 Martin Willi
+ * Copyright (C) 2014 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <test_runner.h>
+#include <hydra.h>
+#include <daemon.h>
+
+/* declare test suite constructors */
+#define TEST_SUITE(x) test_suite_t* x();
+#define TEST_SUITE_DEPEND(x, ...) TEST_SUITE(x)
+#include "libcharon_tests.h"
+#undef TEST_SUITE
+#undef TEST_SUITE_DEPEND
+
+static test_configuration_t tests[] = {
+#define TEST_SUITE(x) \
+       { .suite = x, },
+#define TEST_SUITE_DEPEND(x, type, args) \
+       { .suite = x, .feature = PLUGIN_DEPENDS(type, args) },
+#include "libcharon_tests.h"
+       { .suite = NULL, }
+};
+
+static bool test_runner_init(bool init)
+{
+       if (init)
+       {
+               libhydra_init();
+               libcharon_init();
+       }
+       else
+       {
+               lib->processor->set_threads(lib->processor, 0);
+               lib->processor->cancel(lib->processor);
+               libcharon_deinit();
+               libhydra_deinit();
+       }
+       return TRUE;
+}
+
+int main(int argc, char *argv[])
+{
+       return test_runner_run("libcharon", tests, test_runner_init);
+}

diff --git a/src/libcharon/tests/libcharon_tests.h b/src/libcharon/tests/libcharon_tests.h
new file mode 100644 (file)
index 0000000..05502f1
--- /dev/null
+++ b/src/libcharon/tests/libcharon_tests.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2014 Martin Willi
+ * Copyright (C) 2014 revosec AG
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */