diff options
| author | Mark Wielaard <mark@klomp.org> | 2017-04-15 01:03:01 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-04-19 12:36:05 +0300 |
| commit | c87699dedd692b7411521cd7e27dcd03cbfcb308 (patch) | |
| tree | 0109ec2a0e3ce22507f30e713b79085dfad8991e | |
| parent | 3790a6872749a9601be6044be7d8fb0951131376 (diff) | |
| download | rpm-c87699dedd692b7411521cd7e27dcd03cbfcb308.tar.gz | |
Make rpmsign tests work for builddir != srcdir.
The gpg HOME is in the builddir testing directory.
But the keys to import are in the srcdir data/keys directory.
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | tests/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 6adc7096a..5fa06ebf1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -110,7 +110,7 @@ EXTRA_DIST += atlocal.in # Hack: Abusing testing$(bindir)/rpmbuild as stamp file # The chmod is needed when copying from read-only sources (eg in distcheck) testing$(bindir)/rpmbuild: ../rpmbuild - HOME=$(abs_srcdir)/testing gpg-connect-agent --no-autostart killagent bye ||: + HOME=$(abs_builddir)/testing gpg-connect-agent --no-autostart killagent bye ||: rm -rf testing mkdir -p testing/$(bindir) ln -s ./$(bindir) testing/bin @@ -126,7 +126,7 @@ testing$(bindir)/rpmbuild: ../rpmbuild for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch; do p=`which $${prog}`; ln -s $${p} testing/$(bindir)/; done for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done (cd testing/magic && file -C) - HOME=$(abs_srcdir)/testing gpg2 --import data/keys/*.secret || HOME=$(abs_srcdir)/testing gpg --import data/keys/*.secret + HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret || HOME=$(abs_builddir)/testing gpg --import ${abs_srcdir}/data/keys/*.secret check_DATA = atconfig atlocal $(TESTSUITE) check_DATA += testing$(bindir)/rpmbuild |