aboutsummaryrefslogtreecommitdiffstats
path: root/trunk/tests/gpg
diff options
context:
space:
mode:
Diffstat (limited to 'trunk/tests/gpg')
-rw-r--r--trunk/tests/gpg/t-decrypt-verify.c4
-rw-r--r--trunk/tests/gpg/t-decrypt.c2
-rw-r--r--trunk/tests/gpg/t-edit.c4
-rw-r--r--trunk/tests/gpg/t-encrypt-sign.c3
-rw-r--r--trunk/tests/gpg/t-encrypt-sym.c5
-rw-r--r--trunk/tests/gpg/t-encrypt.c5
-rw-r--r--trunk/tests/gpg/t-eventloop.c2
-rw-r--r--trunk/tests/gpg/t-export.c2
-rw-r--r--trunk/tests/gpg/t-genkey.c2
-rw-r--r--trunk/tests/gpg/t-import.c2
-rw-r--r--trunk/tests/gpg/t-keylist-sig.c3
-rw-r--r--trunk/tests/gpg/t-keylist.c3
-rw-r--r--trunk/tests/gpg/t-sign.c6
-rw-r--r--trunk/tests/gpg/t-signers.c2
-rw-r--r--trunk/tests/gpg/t-support.h17
-rw-r--r--trunk/tests/gpg/t-trustlist.c2
-rw-r--r--trunk/tests/gpg/t-verify.c2
17 files changed, 44 insertions, 22 deletions
diff --git a/trunk/tests/gpg/t-decrypt-verify.c b/trunk/tests/gpg/t-decrypt-verify.c
index a9c04afb..5cbfd0de 100644
--- a/trunk/tests/gpg/t-decrypt-verify.c
+++ b/trunk/tests/gpg/t-decrypt-verify.c
@@ -98,6 +98,8 @@ main (int argc, char *argv[])
const char *cipher_2_asc = make_filename ("cipher-2.asc");
char *agent_info;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
@@ -130,5 +132,3 @@ main (int argc, char *argv[])
gpgme_release (ctx);
return 0;
}
-
-
diff --git a/trunk/tests/gpg/t-decrypt.c b/trunk/tests/gpg/t-decrypt.c
index 8c18d783..bfe05b29 100644
--- a/trunk/tests/gpg/t-decrypt.c
+++ b/trunk/tests/gpg/t-decrypt.c
@@ -39,6 +39,8 @@ main (int argc, char *argv[])
const char *cipher_1_asc = make_filename ("cipher-1.asc");
char *agent_info;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-edit.c b/trunk/tests/gpg/t-edit.c
index d2d2e1b8..cefcbc41 100644
--- a/trunk/tests/gpg/t-edit.c
+++ b/trunk/tests/gpg/t-edit.c
@@ -113,6 +113,8 @@ main (int argc, char **argv)
const char *pattern = "Alpha";
char *agent_info;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
err = gpgme_data_new (&out);
@@ -141,5 +143,3 @@ main (int argc, char **argv)
return 0;
}
-
-
diff --git a/trunk/tests/gpg/t-encrypt-sign.c b/trunk/tests/gpg/t-encrypt-sign.c
index 858a99c3..19618c43 100644
--- a/trunk/tests/gpg/t-encrypt-sign.c
+++ b/trunk/tests/gpg/t-encrypt-sign.c
@@ -86,8 +86,7 @@ main (int argc, char **argv)
gpgme_sign_result_t sign_result;
char *agent_info;
- err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
- fail_if_err (err);
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-encrypt-sym.c b/trunk/tests/gpg/t-encrypt-sym.c
index 7c84f3dc..29a3f47c 100644
--- a/trunk/tests/gpg/t-encrypt-sym.c
+++ b/trunk/tests/gpg/t-encrypt-sym.c
@@ -40,8 +40,7 @@ main (int argc, char *argv[])
char *p;
size_t len;
- err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
- fail_if_err (err);
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
err = gpgme_new (&ctx);
fail_if_err (err);
@@ -90,5 +89,3 @@ main (int argc, char *argv[])
return 0;
}
-
-
diff --git a/trunk/tests/gpg/t-encrypt.c b/trunk/tests/gpg/t-encrypt.c
index 11ebf3f4..756d216b 100644
--- a/trunk/tests/gpg/t-encrypt.c
+++ b/trunk/tests/gpg/t-encrypt.c
@@ -36,10 +36,7 @@ main (int argc, char *argv[])
gpgme_key_t key[3] = { NULL, NULL, NULL };
gpgme_encrypt_result_t result;
- gpgme_check_version (0);
-
- err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
- fail_if_err (err);
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-eventloop.c b/trunk/tests/gpg/t-eventloop.c
index 43e2c09b..7e8be3c3 100644
--- a/trunk/tests/gpg/t-eventloop.c
+++ b/trunk/tests/gpg/t-eventloop.c
@@ -168,6 +168,8 @@ main (int argc, char *argv[])
gpgme_key_t key[3] = { NULL, NULL, NULL };
int i;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
for (i = 0; i < FDLIST_MAX; i++)
fdlist[i].fd = -1;
diff --git a/trunk/tests/gpg/t-export.c b/trunk/tests/gpg/t-export.c
index a5c24fc6..44c48f93 100644
--- a/trunk/tests/gpg/t-export.c
+++ b/trunk/tests/gpg/t-export.c
@@ -36,6 +36,8 @@ main (int argc, char **argv)
gpgme_data_t out;
const char *pattern[] = { "Alpha", "Bob", NULL };
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-genkey.c b/trunk/tests/gpg/t-genkey.c
index b218122e..52bb99f2 100644
--- a/trunk/tests/gpg/t-genkey.c
+++ b/trunk/tests/gpg/t-genkey.c
@@ -68,6 +68,8 @@ main (int argc, char **argv)
"</GnupgKeyParms>\n";
gpgme_genkey_result_t result;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-import.c b/trunk/tests/gpg/t-import.c
index 3733d5c6..22528e01 100644
--- a/trunk/tests/gpg/t-import.c
+++ b/trunk/tests/gpg/t-import.c
@@ -203,6 +203,8 @@ main (int argc, char *argv[])
const char *pubkey_1_asc = make_filename ("pubkey-1.asc");
const char *seckey_1_asc = make_filename ("seckey-1.asc");
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-keylist-sig.c b/trunk/tests/gpg/t-keylist-sig.c
index 88549d26..6578eeb0 100644
--- a/trunk/tests/gpg/t-keylist-sig.c
+++ b/trunk/tests/gpg/t-keylist-sig.c
@@ -74,8 +74,7 @@ main (int argc, char **argv)
int mode;
int i = 0;
- err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
- fail_if_err (err);
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-keylist.c b/trunk/tests/gpg/t-keylist.c
index 9e68f0cc..17c35edb 100644
--- a/trunk/tests/gpg/t-keylist.c
+++ b/trunk/tests/gpg/t-keylist.c
@@ -113,8 +113,7 @@ main (int argc, char **argv)
gpgme_keylist_result_t result;
int i = 0;
- err = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
- fail_if_err (err);
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-sign.c b/trunk/tests/gpg/t-sign.c
index 78e590b9..1b9d06d4 100644
--- a/trunk/tests/gpg/t-sign.c
+++ b/trunk/tests/gpg/t-sign.c
@@ -84,6 +84,8 @@ main (int argc, char **argv)
gpgme_sign_result_t result;
char *agent_info;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
@@ -133,7 +135,3 @@ main (int argc, char **argv)
gpgme_release (ctx);
return 0;
}
-
-
-
-
diff --git a/trunk/tests/gpg/t-signers.c b/trunk/tests/gpg/t-signers.c
index d74d4479..f8288b49 100644
--- a/trunk/tests/gpg/t-signers.c
+++ b/trunk/tests/gpg/t-signers.c
@@ -96,6 +96,8 @@ main (int argc, char *argv[])
gpgme_sign_result_t result;
char *agent_info;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-support.h b/trunk/tests/gpg/t-support.h
index e9ea283d..929a5d13 100644
--- a/trunk/tests/gpg/t-support.h
+++ b/trunk/tests/gpg/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/trunk/tests/gpg/t-trustlist.c b/trunk/tests/gpg/t-trustlist.c
index db10cf0c..c8c82f82 100644
--- a/trunk/tests/gpg/t-trustlist.c
+++ b/trunk/tests/gpg/t-trustlist.c
@@ -34,6 +34,8 @@ main (int argc, char *argv[])
gpgme_error_t err;
gpgme_trust_item_t item;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);
diff --git a/trunk/tests/gpg/t-verify.c b/trunk/tests/gpg/t-verify.c
index b4912e3f..83e942f0 100644
--- a/trunk/tests/gpg/t-verify.c
+++ b/trunk/tests/gpg/t-verify.c
@@ -151,6 +151,8 @@ main (int argc, char *argv[])
gpgme_data_t sig, text;
gpgme_verify_result_t result;
+ init_gpgme (GPGME_PROTOCOL_OpenPGP);
+
err = gpgme_new (&ctx);
fail_if_err (err);