diff options
| author | Stef Walter <stefw@gnome.org> | 2013-03-03 10:05:03 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2013-03-03 10:07:18 +0100 |
| commit | 205ed0e0e26010150950e9e963a9a36693b5f71e (patch) | |
| tree | 35f664c72da993e0a398e8e717b7f95ca1fc6adc | |
| parent | 6c55425a7de23a71d0abc3137f0015e878188bae (diff) | |
| download | p11-kit-205ed0e0e26010150950e9e963a9a36693b5f71e.tar.gz | |
Initialize modules correctly in tests
This fixes hangs when running tests on windows
| -rw-r--r-- | tools/tests/test-extract.c | 2 | ||||
| -rw-r--r-- | tools/tests/test-openssl.c | 2 | ||||
| -rw-r--r-- | tools/tests/test-pem.c | 2 | ||||
| -rw-r--r-- | tools/tests/test-save.c | 2 | ||||
| -rw-r--r-- | tools/tests/test-x509.c | 2 | ||||
| -rw-r--r-- | trust/tests/test-module.c | 2 | ||||
| -rw-r--r-- | trust/tests/test-parser.c | 1 | ||||
| -rw-r--r-- | trust/tests/test-session.c | 1 | ||||
| -rw-r--r-- | trust/tests/test-token.c | 1 |
9 files changed, 14 insertions, 1 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); diff --git a/trust/tests/test-module.c b/trust/tests/test-module.c index 577ae5a..2e085ba 100644 --- a/trust/tests/test-module.c +++ b/trust/tests/test-module.c @@ -345,8 +345,8 @@ main (void) int ret; putenv ("P11_KIT_STRICT=1"); + p11_library_init (); p11_debug_init (); - /* p11_message_quiet (); */ SUITE_ADD_TEST (suite, test_find_certificates); SUITE_ADD_TEST (suite, test_find_builtin); diff --git a/trust/tests/test-parser.c b/trust/tests/test-parser.c index 931f85c..581ff5e 100644 --- a/trust/tests/test-parser.c +++ b/trust/tests/test-parser.c @@ -808,6 +808,7 @@ main (void) int ret; putenv ("P11_KIT_STRICT=1"); + p11_library_init (); p11_debug_init (); p11_message_quiet (); diff --git a/trust/tests/test-session.c b/trust/tests/test-session.c index d77f461..d420d5c 100644 --- a/trust/tests/test-session.c +++ b/trust/tests/test-session.c @@ -142,6 +142,7 @@ main (void) int ret; putenv ("P11_KIT_STRICT=1"); + p11_library_init (); p11_debug_init (); p11_message_quiet (); diff --git a/trust/tests/test-token.c b/trust/tests/test-token.c index 027a05e..382d021 100644 --- a/trust/tests/test-token.c +++ b/trust/tests/test-token.c @@ -89,6 +89,7 @@ main (void) int ret; putenv ("P11_KIT_STRICT=1"); + p11_library_init (); p11_debug_init (); p11_message_quiet (); |