Move gpg test programs to the top test directory.

This commit is contained in:
Werner Koch 2009-07-07 14:17:39 +00:00
parent dab2485755
commit 43427b0c91
6 changed files with 25 additions and 10 deletions

View File

@ -1,3 +1,16 @@
2009-07-07 Werner Koch <wk@g10code.com>
* gpg/pgp-keylist.c: Rename to ...
* run-keylist.c: ... this.
* gpg/pgp-import.c: Rename to ...
* run-import.c: ... this.
* gpg/pgp-export.c: Rename to ...
* run-export.c: ... this.
* run-support.h: New. Copied from gpg/t-support.h.
* gpg/Makefile.am (noinst_PROGRAMS): Remove them.
* Makefile.am (noinst_PROGRAMS): Add them.
(noinst_HEADERS): New.
2009-06-22 Marcus Brinkmann <marcus@g10code.de> 2009-06-22 Marcus Brinkmann <marcus@g10code.de>
* gpg/t-support.h (passphrase_cb): Implement write() according to * gpg/t-support.h (passphrase_cb): Implement write() according to

View File

@ -30,7 +30,10 @@ INCLUDES = -I$(top_builddir)/src
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@ LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
noinst_PROGRAMS = $(TESTS) noinst_HEADERS = run-support.h
noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import
if RUN_GPG_TESTS if RUN_GPG_TESTS
gpgtests = gpg gpgtests = gpg

View File

@ -50,8 +50,7 @@ LDADD = ../../src/libgpgme.la
t_thread1_LDADD = ../../src/libgpgme-pthread.la t_thread1_LDADD = ../../src/libgpgme-pthread.la
# We don't run t-genkey in the test suite, because it takes too long # We don't run t-genkey in the test suite, because it takes too long
# The other programs are used for debugging. noinst_PROGRAMS = $(TESTS) t-genkey
noinst_PROGRAMS = $(TESTS) t-genkey pgp-keylist pgp-export pgp-import
mkdemodirs: mkdemodirs.in Makefile mkdemodirs: mkdemodirs.in Makefile
sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs

View File

@ -29,9 +29,9 @@
#include <gpgme.h> #include <gpgme.h>
#define PGM "pgp-export" #define PGM "run-export"
#include "t-support.h" #include "run-support.h"
static int verbose; static int verbose;

View File

@ -29,9 +29,9 @@
#include <gpgme.h> #include <gpgme.h>
#define PGM "pgp-import" #define PGM "run-import"
#include "t-support.h" #include "run-support.h"
static int verbose; static int verbose;

View File

@ -1,4 +1,4 @@
/* pgp-keylist.c - Helper to show a key listing. /* run-keylist.c - Helper to show a key listing.
Copyright (C) 2008, 2009 g10 Code GmbH Copyright (C) 2008, 2009 g10 Code GmbH
This file is part of GPGME. This file is part of GPGME.
@ -29,9 +29,9 @@
#include <gpgme.h> #include <gpgme.h>
#define PGM "pgp-keylist" #define PGM "run-keylist"
#include "t-support.h" #include "run-support.h"
static int verbose; static int verbose;