summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-03-03 10:05:03 +0100
committerStef Walter <stefw@gnome.org>2013-03-03 10:07:18 +0100
commit205ed0e0e26010150950e9e963a9a36693b5f71e (patch)
tree35f664c72da993e0a398e8e717b7f95ca1fc6adc /tools
parent6c55425a7de23a71d0abc3137f0015e878188bae (diff)
Initialize modules correctly in tests
This fixes hangs when running tests on windows
Diffstat (limited to 'tools')
-rw-r--r--tools/tests/test-extract.c2
-rw-r--r--tools/tests/test-openssl.c2
-rw-r--r--tools/tests/test-pem.c2
-rw-r--r--tools/tests/test-save.c2
-rw-r--r--tools/tests/test-x509.c2
5 files changed, 10 insertions, 0 deletions
diff --git a/tools/tests/test-extract.c b/tools/tests/test-extract.c
index 55a3524..8bdd600 100644
--- a/tools/tests/test-extract.c
+++ b/tools/tests/test-extract.c
@@ -280,6 +280,8 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
+ p11_library_init ();
+ mock_module_init ();
p11_debug_init ();
SUITE_ADD_TEST (suite, test_file_name_for_label);
diff --git a/tools/tests/test-openssl.c b/tools/tests/test-openssl.c
index bce9be6..4c39b07 100644
--- a/tools/tests/test-openssl.c
+++ b/tools/tests/test-openssl.c
@@ -648,6 +648,8 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
+ p11_library_init ();
+ mock_module_init ();
p11_debug_init ();
SUITE_ADD_TEST (suite, test_file);
diff --git a/tools/tests/test-pem.c b/tools/tests/test-pem.c
index ccc58be..3be8fee 100644
--- a/tools/tests/test-pem.c
+++ b/tools/tests/test-pem.c
@@ -249,6 +249,8 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
+ p11_library_init ();
+ mock_module_init ();
p11_debug_init ();
SUITE_ADD_TEST (suite, test_file);
diff --git a/tools/tests/test-save.c b/tools/tests/test-save.c
index 4ceb4a8..41f4e08 100644
--- a/tools/tests/test-save.c
+++ b/tools/tests/test-save.c
@@ -490,6 +490,8 @@ main (void)
CuSuite* suite = CuSuiteNew ();
int ret;
+ p11_library_init ();
+
SUITE_ADD_TEST (suite, test_file_write);
SUITE_ADD_TEST (suite, test_file_exists);
SUITE_ADD_TEST (suite, test_file_bad_directory);
diff --git a/tools/tests/test-x509.c b/tools/tests/test-x509.c
index 0367cbd..f3585f1 100644
--- a/tools/tests/test-x509.c
+++ b/tools/tests/test-x509.c
@@ -256,6 +256,8 @@ main (void)
int ret;
putenv ("P11_KIT_STRICT=1");
+ p11_library_init ();
+ mock_module_init ();
p11_debug_init ();
SUITE_ADD_TEST (suite, test_file);