make -j build fix gnupg-2.0.14
authorWerner Koch <wk@gnupg.org>
Mon, 21 Dec 2009 18:03:26 +0000 (18:03 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 21 Dec 2009 18:03:26 +0000 (18:03 +0000)
tests/openpgp/ChangeLog
tests/openpgp/Makefile.am

index 21d4ef1..6afd87c 100644 (file)
@@ -1,3 +1,8 @@
+2009-12-21  Werner Koch  <wk@g10code.com>
+
+       * Makefile.am (required_pgms): New.
+       (./gpg_dearmor): Depend on them.
+
 2009-06-05  David Shaw  <dshaw@jabberwocky.com>
 
        * defs.inc: Improved all_cipher_algos and all_hash_algos to work
index d59e298..1cdf6ed 100644 (file)
 GPG_IMPORT = ../../g10/gpg2 --homedir . \
               --quiet --yes --no-permission-warning --import
 
+# Programs required before we can run these tests.
+required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
+                ../../tools/gpg-connect-agent
+
 TESTS = version.test mds.test \
        decrypt.test decrypt-dsa.test \
        sigs.test sigs-dsa.test \
@@ -60,7 +64,9 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
         $(GPG_IMPORT) $(srcdir)/pubdemo.asc     
         echo timestamp >./prepared.stamp
 
-./gpg_dearmor:
+# We need to depend on a couple of programs so that the tests don't
+# start before all programs are built.
+./gpg_dearmor: $(required_pgms)
        echo '#!/bin/sh' >./gpg_dearmor
        echo "../../g10/gpg2 --no-options --no-greeting \
              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor