1 files changed, 3 insertions, 14 deletions
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index a4c46ae8..9e68f0cc 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -24,20 +24,9 @@
 
 #include <gpgme.h>
 
-
-#define fail_if_err(err)					\
-  do								\
-    {								\
-      if (err)							\
-        {							\
-          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
-                   __FILE__, __LINE__, gpgme_strerror (err));   \
-          exit (1);						\
-        }							\
-    }								\
-  while (0)
-
+#include "t-support.h"
 
+
 struct
 {
   char *fpr;
@@ -514,7 +503,7 @@ main (int argc, char **argv)
       gpgme_key_unref (key);
       i++;
     }
-  if (err != GPGME_EOF)
+  if (gpg_err_code (err) != GPG_ERR_EOF)
     fail_if_err (err);
   err = gpgme_op_keylist_end (ctx);
   fail_if_err (err);