1 files changed, 3 insertions, 29 deletions
diff --git a/tests/gpg/t-eventloop.c b/tests/gpg/t-eventloop.c
index 990876d7..43e2c09b 100644
--- a/tests/gpg/t-eventloop.c
+++ b/tests/gpg/t-eventloop.c
@@ -27,35 +27,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)
-
-
-static void
-print_data (gpgme_data_t dh)
-{
-  char buf[100];
-  int ret;
-  
-  ret = gpgme_data_seek (dh, 0, SEEK_SET);
-  if (ret)
-    fail_if_err (GPGME_File_Error);
-  while ((ret = gpgme_data_read (dh, buf, 100)) > 0)
-    fwrite (buf, ret, 1, stdout);
-  if (ret < 0)
-    fail_if_err (GPGME_File_Error);
-}
-
+#include "t-support.h"
 
+
 /* Stripped down version of gpgme/wait.c.  */
 
 struct op_result
@@ -96,7 +70,7 @@ add_io_cb (void *data, int fd, int dir, gpgme_io_cb_t fnc, void *fnc_data,
 	}
     }
   if (i == FDLIST_MAX)
-    return GPGME_General_Error;
+    return gpg_err_make (GPG_ERR_SOURCE_USER_1, GPG_ERR_GENERAL);
   *r_tag = &fds[i];
   return 0;
 }