4 files changed, 61 insertions, 17 deletions
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index d99c3d9c5..bf9673f74 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -109,7 +109,7 @@ check: xcheck
 .PHONY: xcheck
 xcheck:
 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
-	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(XTESTS)
+	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
@@ -250,7 +250,7 @@ sample_msgs = samplemsgs/clearsig-1-key-1.asc \
 EXTRA_DIST = defs.scm $(XTESTS) $(TEST_FILES) \
 	     mkdemodirs signdemokey $(priv_keys) $(sample_keys)   \
 	     $(sample_msgs) ChangeLog-2011 run-tests.scm \
-	     setup.scm shell.scm
+	     setup.scm shell.scm all-tests.scm
 
 CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
 	     plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
diff --git a/tests/openpgp/README b/tests/openpgp/README
index b9d560797..42e78ae2d 100644
--- a/tests/openpgp/README
+++ b/tests/openpgp/README
@@ -7,7 +7,7 @@ From your build directory, run
 
 to run all tests or
 
-  obj $ make -C tests/openpgp check XTESTS=your-test.scm
+  obj $ make -C tests/openpgp check TESTS=your-test.scm
 
 to run a specific test (or any number of tests separated by spaces).
 
@@ -89,7 +89,7 @@ the inner progress indicator will be abbreviated using '.'.
 Say you are working on a new test called 'your-test.scm', you can run
 it on its own using
 
-  obj $ make -C tests/openpgp check XTESTS=your-test.scm
+  obj $ make -C tests/openpgp check TESTS=your-test.scm
 
 but something isn't working as expected.  There are several little
 gadgets that might help.  The first one is 'trace', a function that
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
new file mode 100644
index 000000000..4b14c4e04
--- /dev/null
+++ b/tests/openpgp/all-tests.scm
@@ -0,0 +1,43 @@
+;; Copyright (C) 2017 g10 Code GmbH
+;;
+;; This file is part of GnuPG.
+;;
+;; GnuPG is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3 of the License, or
+;; (at your option) any later version.
+;;
+;; GnuPG is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;;
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+(export all-tests
+ ;; Parse the Makefile.am to find all tests.
+
+ (load (with-path "makefile.scm"))
+
+ (define (expander filename port key)
+   (parse-makefile port key))
+
+ (define (parse filename key)
+   (parse-makefile-expand filename expander key))
+
+ (define setup
+   (make-environment-cache
+    (test::scm
+     #f
+     (path-join "tests" "openpgp" "setup.scm")
+     (in-srcdir "tests" "openpgp" "setup.scm")
+     "--" "tests" "gpg")))
+
+ (map (lambda (name)
+	(test::scm setup
+		   (path-join "tests" "openpgp" name)
+		   (in-srcdir "tests" "openpgp" name)))
+      (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am")
+			     (lambda (filename port key) (parse-makefile port key))
+			     "XTESTS")))
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index d443d1fb8..d4914bda7 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -26,16 +26,17 @@
 ;; Set objdir so that the tests can locate built programs.
 (setenv "objdir" (getcwd) #f)
 
-(let* ((tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))
-       (setup (make-environment-cache (test::scm
-				       #f
-				       (path-join "tests" "openpgp" "setup.scm")
-				       (in-srcdir "tests" "openpgp" "setup.scm"))))
-       (runner (if (and (member "--parallel" *args*)
-			(> (length tests) 1))
-		   run-tests-parallel
-		   run-tests-sequential)))
-  (runner (map (lambda (name)
-		 (test::scm setup
-			    (path-join "tests" "openpgp" name)
-			    (in-srcdir "tests" "openpgp" name))) tests)))
+(define setup
+  (make-environment-cache (test::scm
+			   #f
+			   (path-join "tests" "openpgp" "setup.scm")
+			   (in-srcdir "tests" "openpgp" "setup.scm"))))
+
+(define tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))
+
+(run-tests (if (null? tests)
+	       (load-tests "tests" "openpgp")
+	       (map (lambda (name)
+		      (test::scm setup
+				 (path-join "tests" "openpgp" name)
+				 (in-srcdir "tests" "openpgp" name))) tests)))