Include "t-support.h".

diff --git a/tests/gpgsm/t-import.c b/tests/gpgsm/t-import.c
index c9c31ffd0b7e4372c990f3515a3600f45e020b41..433815691185ea1f96767c262dbbf111407c863d 100644 (file)
--- a/tests/gpgsm/t-import.c
+++ b/tests/gpgsm/t-import.c
@@ -25,40 +25,7 @@
 
 #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 char *
-make_filename (const char *fname)
-{
-  const char *srcdir = getenv ("srcdir");
-  char *buf;
-
-  if (!srcdir)
-    srcdir = ".";
-  buf = malloc (strlen(srcdir) + strlen(fname) + 2);
-  if (!buf)
-    {
-      fprintf (stderr, "%s:%d: could not allocate string: %s\n",
-              __FILE__, __LINE__, strerror (errno));
-      exit (1);
-    }
-  strcpy (buf, srcdir);
-  strcat (buf, "/");
-  strcat (buf, fname);
-  return buf;
-}
+#include "t-support.h"
 
 
 void

diff --git a/tests/gpgsm/t-keylist.c b/tests/gpgsm/t-keylist.c
index b0249d1232f07fb6105f6b53ad30eafcd63306a4..cf4073fccc88a8479569feca63a8769e8f5995a6 100644 (file)
--- a/tests/gpgsm/t-keylist.c
+++ b/tests/gpgsm/t-keylist.c
@@ -24,20 +24,9 @@
 
 #include <gpgme.h>
 
-\f
-#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"
 
+\f
 struct
 {
   char *fpr;
@@ -73,6 +62,7 @@ keys[] =
     { NULL }
   };
 
+
 int 
 main (int argc, char **argv)
 {

diff --git a/tests/gpgsm/t-verify.c b/tests/gpgsm/t-verify.c
index c8913a91ef6ade4da80336a295c9aef27420646e..304fc2c6cb1e9743d332d3741d5ba1379d729135 100644 (file)
--- a/tests/gpgsm/t-verify.c
+++ b/tests/gpgsm/t-verify.c
@@ -24,18 +24,7 @@
 
 #include <gpgme.h>
 
-\f
-#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"
 
 \f
 static const char test_text1[] = "Hallo Leute!\n";