summaryrefslogtreecommitdiff
path: root/trust/tests
diff options
context:
space:
mode:
Diffstat (limited to 'trust/tests')
-rw-r--r--trust/tests/Makefile.am5
-rw-r--r--trust/tests/test-builder.c3
-rw-r--r--trust/tests/test-index.c3
-rw-r--r--trust/tests/test-module.c2
-rw-r--r--trust/tests/test-parser.c3
-rw-r--r--trust/tests/test-persist.c3
-rw-r--r--trust/tests/test-token.c3
7 files changed, 7 insertions, 15 deletions
diff --git a/trust/tests/Makefile.am b/trust/tests/Makefile.am
index 653bd0d..90b9fb5 100644
--- a/trust/tests/Makefile.am
+++ b/trust/tests/Makefile.am
@@ -19,7 +19,7 @@ LDADD = \
$(top_builddir)/trust/libtrust-testable.la \
$(top_builddir)/common/libp11-data.la \
$(top_builddir)/common/libp11-library.la \
- $(top_builddir)/common/libp11-compat.la \
+ $(top_builddir)/common/libp11-common.la \
$(builddir)/libtestdata.la \
$(LIBTASN1_LIBS) \
$(CUTEST_LIBS) \
@@ -41,8 +41,7 @@ noinst_PROGRAMS = \
$(CHECK_PROGS)
frob_nss_trust_LDADD = \
- $(top_builddir)/common/libp11-library.la \
- $(top_builddir)/common/libp11-compat.la \
+ $(top_builddir)/common/libp11-common.la \
$(top_builddir)/p11-kit/libp11-kit.la
TESTS = $(CHECK_PROGS)
diff --git a/trust/tests/test-builder.c b/trust/tests/test-builder.c
index 5ce3b22..7cab1f6 100644
--- a/trust/tests/test-builder.c
+++ b/trust/tests/test-builder.c
@@ -44,7 +44,7 @@
#include "hash.h"
#include "debug.h"
#include "index.h"
-#include "library.h"
+#include "message.h"
#include "oid.h"
#include "pkcs11x.h"
@@ -1722,7 +1722,6 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
- p11_library_init ();
p11_debug_init ();
/* p11_message_quiet (); */
diff --git a/trust/tests/test-index.c b/trust/tests/test-index.c
index 14f5a8a..8405061 100644
--- a/trust/tests/test-index.c
+++ b/trust/tests/test-index.c
@@ -41,8 +41,8 @@
#include "attrs.h"
#include "debug.h"
-#include "library.h"
#include "index.h"
+#include "message.h"
#include "test-data.h"
@@ -1036,7 +1036,6 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
- p11_library_init ();
p11_debug_init ();
p11_message_quiet ();
diff --git a/trust/tests/test-module.c b/trust/tests/test-module.c
index c92e1c3..525a68e 100644
--- a/trust/tests/test-module.c
+++ b/trust/tests/test-module.c
@@ -42,7 +42,6 @@
#define CRYPTOKI_EXPORTS
#include "attrs.h"
-#include "debug.h"
#include "hash.h"
#include "library.h"
#include "pkcs11x.h"
@@ -898,7 +897,6 @@ main (void)
putenv ("P11_KIT_STRICT=1");
p11_library_init ();
- p11_debug_init ();
SUITE_ADD_TEST (suite, test_get_slot_list);
SUITE_ADD_TEST (suite, test_get_slot_info);
diff --git a/trust/tests/test-parser.c b/trust/tests/test-parser.c
index 94cfc49..147823a 100644
--- a/trust/tests/test-parser.c
+++ b/trust/tests/test-parser.c
@@ -43,7 +43,7 @@
#include "attrs.h"
#include "builder.h"
#include "debug.h"
-#include "library.h"
+#include "message.h"
#include "oid.h"
#include "parser.h"
#include "pkcs11x.h"
@@ -570,7 +570,6 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
- p11_library_init ();
p11_debug_init ();
SUITE_ADD_TEST (suite, test_parse_der_certificate);
diff --git a/trust/tests/test-persist.c b/trust/tests/test-persist.c
index b9a79e9..ee73331 100644
--- a/trust/tests/test-persist.c
+++ b/trust/tests/test-persist.c
@@ -43,7 +43,7 @@
#include "attrs.h"
#include "compat.h"
#include "debug.h"
-#include "library.h"
+#include "message.h"
#include "persist.h"
#include "pkcs11.h"
#include "pkcs11x.h"
@@ -441,7 +441,6 @@ main (void)
putenv ("P11_KIT_STRICT=1");
p11_debug_init ();
- p11_library_init ();
SUITE_ADD_TEST (suite, test_magic);
SUITE_ADD_TEST (suite, test_simple);
diff --git a/trust/tests/test-token.c b/trust/tests/test-token.c
index 6cf687b..ffd733f 100644
--- a/trust/tests/test-token.c
+++ b/trust/tests/test-token.c
@@ -42,7 +42,7 @@
#include "attrs.h"
#include "debug.h"
#include "pkcs11x.h"
-#include "library.h"
+#include "message.h"
#include "test-data.h"
#include "token.h"
@@ -235,7 +235,6 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
- p11_library_init ();
p11_debug_init ();
SUITE_ADD_TEST (suite, test_token_load);