Fix test suite for GnuPG 2.1 which uses pubring.kbx.
authorWerner Koch <wk@gnupg.org>
Mon, 8 Jun 2015 08:43:29 +0000 (10:43 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 8 Jun 2015 08:43:29 +0000 (10:43 +0200)
commita5b040cc57c65b3d105666b90c7eb59ee6ff3882
tree6ead4e6bd57cb045c2a734f6a704dae3ab510357
parent87d713ff41454bd08a345c63605f6fc7ac854dd4
Fix test suite for GnuPG 2.1 which uses pubring.kbx.

* tests/gpgsm/final.test: New.
* tests/gpgsm/initial.test: New.
* tests/gpg/start-stop-agent: Move to ../.
* tests/gpgsm/Makefile.am (TESTS_ENVIRONMENT): Export top_srcdir.
(TESTS): Add intial.test and final.test.
(AM_LDFLAGS): Add -no-install.
(clean-local): Use start-stop-agent
(initial.test): Add dependency.
* tests/gpg/Makefile.am (top_srcdir): Export top_srcdir.
(AM_LDFLAGS): Add -no-install.
(check-local): Depend on pubring-stamp instead of pubring.gpg.
(initial.test): Depend on check-local.
(./pubring-gpg): Replace by rule for ./pubring-stamp.
--

There are also a couple of other changes which should make the tests a
bit more robust and the gpg and gpgsm tests more similar.

The -no-install avoids creating wrappers for test programs, which make
debugging easier.

The dependency on check-local guarantees that its rules are run before
the first test.  This is important because conf files are setup by
this rule.  Earlier automake versions seem to have run check-local
always before the tests but today the order of execution is not
defined.

Signed-off-by: Werner Koch <wk@gnupg.org>
tests/Makefile.am
tests/gpg/Makefile.am
tests/gpg/final.test
tests/gpg/initial.test
tests/gpgsm/Makefile.am
tests/gpgsm/final.test [new file with mode: 0755]
tests/gpgsm/initial.test [new file with mode: 0755]
tests/start-stop-agent [moved from tests/gpg/start-stop-agent with 100% similarity]