9 files changed, 29 insertions, 19 deletions
diff --git a/tests/gpgsm/t-decrypt.c b/tests/gpgsm/t-decrypt.c
index 21d6bd14..ca5757dc 100644
--- a/tests/gpgsm/t-decrypt.c
+++ b/tests/gpgsm/t-decrypt.c
@@ -49,6 +49,8 @@ main (int argc, char *argv[])
   gpgme_data_t in, out;
   gpgme_decrypt_result_t result;
 
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
@@ -75,5 +77,3 @@ main (int argc, char *argv[])
   gpgme_release (ctx);
   return 0;
 }
-
-
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 4da0f727..ff61394b 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -35,8 +35,7 @@ main (int argc, char **argv)
   gpgme_key_t key[] = { NULL, NULL };
   gpgme_encrypt_result_t result;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index a2355e0c..ce7dadb8 100644
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -34,6 +34,9 @@ main (int argc, char *argv[])
   gpgme_error_t err;
   gpgme_data_t out;
   const char *pattern[] = { "DFN Top Level Certification Authority", NULL };
+
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
diff --git a/tests/gpgsm/t-genkey.c b/tests/gpgsm/t-genkey.c
index 8b08a65b..a4d60c1e 100644
--- a/tests/gpgsm/t-genkey.c
+++ b/tests/gpgsm/t-genkey.c
@@ -64,8 +64,7 @@ main (int argc, char *argv[])
   gpgme_genkey_result_t result;
   gpgme_data_t certreq;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_data_new (&certreq);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-import.c b/tests/gpgsm/t-import.c
index 2b50e10e..c9c31ffd 100644
--- a/tests/gpgsm/t-import.c
+++ b/tests/gpgsm/t-import.c
@@ -161,8 +161,7 @@ main (int argc, char **argv)
   const char *cert_1 = make_filename ("cert_dfn_pca01.der");
   const char *cert_2 = make_filename ("cert_dfn_pca15.der");
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index 7e596283..b0249d12 100644
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -82,8 +82,7 @@ main (int argc, char **argv)
   gpgme_keylist_result_t result;
   int i = 0;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
diff --git a/tests/gpgsm/t-sign.c b/tests/gpgsm/t-sign.c
index 5fd6f069..2cfac7da 100644
--- a/tests/gpgsm/t-sign.c
+++ b/tests/gpgsm/t-sign.c
@@ -81,8 +81,7 @@ main (int argc, char *argv[])
   gpgme_data_t in, out;
   gpgme_sign_result_t result;
 
-  err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
-  fail_if_err (err);
+  init_gpgme (GPGME_PROTOCOL_CMS);
 
   err = gpgme_new (&ctx);
   fail_if_err (err);
@@ -119,7 +118,3 @@ main (int argc, char *argv[])
   gpgme_release (ctx);
   return 0;
 }
-
-
-
-
diff --git a/tests/gpgsm/t-support.h b/tests/gpgsm/t-support.h
index c6470515..3199b056 100644
--- a/tests/gpgsm/t-support.h
+++ b/tests/gpgsm/t-support.h
@@ -20,6 +20,8 @@
 
 #include <unistd.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <locale.h>
 
 #include <gpgme.h>
 
@@ -79,3 +81,18 @@ make_filename (const char *fname)
   strcat (buf, fname);
   return buf;
 }
+
+
+void
+init_gpgme (gpgme_protocol_t proto)
+{
+  gpgme_error_t err;
+
+  gpgme_check_version (NULL);
+  setlocale (LC_ALL, "");
+  gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
+  gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
+
+  err = gpgme_engine_check_version (proto);
+  fail_if_err (err);
+}
diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index be61cbb2..c8913a91 100644
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -119,6 +119,8 @@ main (int argc, char **argv)
   gpgme_data_t sig, text;
   gpgme_verify_result_t result;
 
+  init_gpgme (GPGME_PROTOCOL_CMS);
+
   err = gpgme_new (&ctx);
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
@@ -150,6 +152,3 @@ main (int argc, char **argv)
   gpgme_release (ctx);  
   return 0;
 }
-
-
-