diff options
| author | Stef Walter <stefw@gnome.org> | 2013-04-02 20:40:53 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-04-03 10:39:09 +0200 |
| commit | fcc3a83cc4d540bc2c4096524b5e8003046ba561 (patch) | |
| tree | 5bc566d6813448f83269797ce05aadeb02cdf36f /common/tests | |
| parent | ae7dd1be6d431f25b101bc7e2b3fa373a8cbb47b (diff) | |
Separate library init from message code
Put library init/uninit code its into their own statically
linked library so that they don't get linked into the p11-kit
executable.
Refactor the message code so that the library initialization can
plug in its per thread message buffer.
https://bugs.freedesktop.org/show_bug.cgi?id=63046
Diffstat (limited to 'common/tests')
| -rw-r--r-- | common/tests/Makefile.am | 3 | ||||
| -rw-r--r-- | common/tests/test-base64.c | 5 | ||||
| -rw-r--r-- | common/tests/test-lexer.c | 3 | ||||
| -rw-r--r-- | common/tests/test-url.c | 5 |
4 files changed, 8 insertions, 8 deletions
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index d024b80..ba9a72f 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -60,6 +60,5 @@ endif # WITH_ASN1 TESTS = $(CHECK_PROGS) LDADD += \ - $(top_builddir)/common/libp11-library.la \ - $(top_builddir)/common/libp11-compat.la \ + $(top_builddir)/common/libp11-common.la \ $(CUTEST_LIBS) diff --git a/common/tests/test-base64.c b/common/tests/test-base64.c index c053305..90c1f49 100644 --- a/common/tests/test-base64.c +++ b/common/tests/test-base64.c @@ -36,7 +36,8 @@ #include "CuTest.h" #include "base64.h" -#include "library.h" +#include "debug.h" +#include "message.h" #include <assert.h> #include <string.h> @@ -196,7 +197,7 @@ main (void) int ret; putenv ("P11_KIT_STRICT=1"); - p11_library_init (); + p11_debug_init (); SUITE_ADD_TEST (suite, test_decode_simple); SUITE_ADD_TEST (suite, test_decode_thawte); diff --git a/common/tests/test-lexer.c b/common/tests/test-lexer.c index 02ea5c5..58d5d65 100644 --- a/common/tests/test-lexer.c +++ b/common/tests/test-lexer.c @@ -42,7 +42,7 @@ #include "compat.h" #include "debug.h" #include "lexer.h" -#include "library.h" +#include "message.h" #include "pem.h" typedef struct { @@ -260,7 +260,6 @@ main (void) putenv ("P11_KIT_STRICT=1"); p11_debug_init (); - p11_library_init (); SUITE_ADD_TEST (suite, test_basic); SUITE_ADD_TEST (suite, test_corners); diff --git a/common/tests/test-url.c b/common/tests/test-url.c index 096563b..ed84f0c 100644 --- a/common/tests/test-url.c +++ b/common/tests/test-url.c @@ -35,7 +35,8 @@ #include "config.h" #include "CuTest.h" -#include "library.h" +#include "debug.h" +#include "message.h" #include <assert.h> #include <string.h> @@ -146,7 +147,7 @@ main (void) int ret; putenv ("P11_KIT_STRICT=1"); - p11_library_init (); + p11_debug_init (); SUITE_ADD_TEST (suite, test_decode_success); SUITE_ADD_TEST (suite, test_decode_skip); |