[svn] GnuPG - r5244 - branches/STABLE-BRANCH-2-0/tests/openpgp

[svn author wk]

Author: wk
Date: 2009-12-21 19:03:26 +0100 (Mon, 21 Dec 2009)
New Revision: 5244

Modified:
   branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog
   branches/STABLE-BRANCH-2-0/tests/openpgp/Makefile.am
Log:
make -j build fix


Modified: branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog	2009-12-21 17:27:28 UTC (rev 5243)
+++ branches/STABLE-BRANCH-2-0/tests/openpgp/ChangeLog	2009-12-21 18:03:26 UTC (rev 5244)
@@ -1,3 +1,8 @@
+2009-12-21  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (required_pgms): New.
+	(./gpg_dearmor): Depend on them.
+
 2009-06-05  David Shaw  <dshaw at jabberwocky.com>
 
 	* defs.inc: Improved all_cipher_algos and all_hash_algos to work

Modified: branches/STABLE-BRANCH-2-0/tests/openpgp/Makefile.am
===================================================================
--- branches/STABLE-BRANCH-2-0/tests/openpgp/Makefile.am	2009-12-21 17:27:28 UTC (rev 5243)
+++ branches/STABLE-BRANCH-2-0/tests/openpgp/Makefile.am	2009-12-21 18:03:26 UTC (rev 5244)
@@ -19,6 +19,10 @@
 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 @@
 	 $(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