tests: Fix to support --enable-all-tests and variants.

* tests/gpgscm/tests.scm (test::scm): Add VARIANT argument.
(tests::new): Likewise.
(open-log-file, report): Support VARIANT.
* tests/gpgme/all-tests.scm (setup-c, setup-py): Follow the change.
* tests/cms/all-tests.scm: Likewise.
* tests/cms/run-tests.scm: Likewise.
* tests/migrations/all-tests.scm: Likewise.
* tests/migrations/run-tests.scm: Likewise.
* tests/openpgp/all-tests.scm: Likewise.
* tests/openpgp/run-tests.scm: Likewise.

--

Forward port from 2.2 branch of:
	0fd7a902070ad9bdd835fa57dbadff25917bca42

Fixes-commit: 1c88104a3f00f7ca3790fbaab8f67b2b68cd6e18
Signed-off-by: NIIBE Yutaka <[email protected]>

8 files changed, 36 insertions, 16 deletions

diff --git a/tests/cms/all-tests.scm b/tests/cms/all-tests.scm
index 78ad00678..1c04a4a32 100644
--- a/tests/cms/all-tests.scm
+++ b/tests/cms/all-tests.scm
@@ -30,12 +30,16 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "cms" "setup.scm")
      (in-srcdir "tests" "cms" "setup.scm")
+     (path-join "tests" "gpgsm" "setup.scm")
+     (in-srcdir "tests" "gpgsm" "setup.scm")
      "--" "tests" "gpg")))
 
  (map (lambda (name)
 	(test::scm setup
+                   #f
 		   (path-join "tests" "cms" name)
 		   (in-srcdir "tests" "cms" name)))
       (parse-makefile-expand (in-srcdir "tests" "cms" "Makefile.am")
diff --git a/tests/cms/run-tests.scm b/tests/cms/run-tests.scm
index caae86d5b..7079ed3ca 100644
--- a/tests/cms/run-tests.scm
+++ b/tests/cms/run-tests.scm
@@ -28,6 +28,7 @@
 (define setup
   (make-environment-cache (test::scm
 			   #f
+			   #f
 			   (path-join "tests" "cms" "setup.scm")
 			   (in-srcdir "tests" "cms" "setup.scm"))))
 
@@ -35,5 +36,6 @@
 	       (load-tests "tests" "cms")
 	       (map (lambda (name)
 		      (test::scm setup
+			         #f
 				 (path-join "tests" "cms" name)
 				 (in-srcdir "tests" "cms" name))) tests)))
diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm
index f72f8af97..1746c4ee1 100644
--- a/tests/gpgme/all-tests.scm
+++ b/tests/gpgme/all-tests.scm
@@ -40,6 +40,7 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
      (in-srcdir "tests" "gpgme" "setup.scm")
      "--" "tests" "gpg")))
@@ -47,6 +48,7 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
      (in-srcdir "tests" "gpgme" "setup.scm")
      "--" "lang" "python" "tests")))
@@ -71,6 +73,7 @@
 		     (map (lambda (name)
 			    (apply test::scm
 				   `(,(:setup cmpnts)
+                                     #f
 				     ,(apply path-join
 					     `("tests" "gpgme" ,@(:path cmpnts) ,name))
 				     ,(in-srcdir "tests" "gpgme" "wrap.scm")
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 31e140d74..db1025bbb 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -679,14 +679,14 @@
 	name))
 
   (package
-   (define (scm setup name path . args)
+   (define (scm setup variant name path . args)
      ;; Start the process.
      (define (spawn-scm args' in out err)
        (spawn-process-fd `(,*argv0* ,@(verbosity (*verbose*))
 				    ,(locate-test (test-name path))
 				    ,@(if setup (force setup) '())
 				    ,@args' ,@args) in out err))
-     (new name #f spawn-scm #f #f CLOSED_FD (expect-failure? name)))
+     (new variant name #f spawn-scm #f #f CLOSED_FD (expect-failure? name)))
 
    (define (binary setup name path . args)
      ;; Start the process.
@@ -694,9 +694,9 @@
        (spawn-process-fd `(,(test-name path)
 			   ,@(if setup (force setup) '()) ,@args' ,@args)
 			 in out err))
-     (new name #f spawn-binary #f #f CLOSED_FD (expect-failure? name)))
+     (new #f name #f spawn-binary #f #f CLOSED_FD (expect-failure? name)))
 
-   (define (new name directory spawn pid retcode logfd expect-failure)
+   (define (new variant name directory spawn pid retcode logfd expect-failure)
      (package
 
       ;; XXX: OO glue.
@@ -727,7 +727,9 @@
 	(unless log-file-name
 	  (set! log-file-name (path-join
 			       (getenv "objdir")
-			       (string-append name ".log"))))
+			       (if variant
+				   (string-append name "." variant ".log")
+				   (string-append name ".log")))))
 	(catch '() (unlink log-file-name))
 	(open log-file-name (logior O_RDWR O_BINARY O_CREAT) #o600))
 
@@ -776,7 +778,10 @@
 		(seek logfd 0 SEEK_SET)
 		(splice logfd STDERR_FILENO)
 		(close logfd))
-	(echo (string-append (status-string) ":") name))
+	(echo (string-append (status-string) ":")
+	      (if variant
+		  (string-append "<" variant ">" name)
+		  name)))
 
       (define (xml)
 	(xx::tag
diff --git a/tests/migrations/all-tests.scm b/tests/migrations/all-tests.scm
index 421f69679..ba95f5c50 100644
--- a/tests/migrations/all-tests.scm
+++ b/tests/migrations/all-tests.scm
@@ -28,6 +28,7 @@
 
  (map (lambda (name)
 	(test::scm #f
+		   #f
 		   (path-join "tests" "migrations" name)
 		   (in-srcdir "tests" "migrations" name)))
       (parse-makefile-expand (in-srcdir "tests" "migrations" "Makefile.am")
diff --git a/tests/migrations/run-tests.scm b/tests/migrations/run-tests.scm
index f44334c7d..d4db14f56 100644
--- a/tests/migrations/run-tests.scm
+++ b/tests/migrations/run-tests.scm
@@ -23,5 +23,6 @@
 	       (load-tests "tests" "migrations")
 	       (map (lambda (name)
 		      (test::scm #f
+			         #f
 				 (path-join "tests" "migrations" name)
 				 (in-srcdir "tests" "migrations" name))) tests)))
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index 98a8a6507..e40e02dc3 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -30,6 +30,7 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "openpgp" "setup.scm")
      (in-srcdir "tests" "openpgp" "setup.scm"))))
 
@@ -40,7 +41,8 @@
    (make-environment-cache
     (test::scm
      #f
-     (qualify (path-join "tests" "openpgp" "setup.scm") variant)
+     variant
+     (path-join "tests" "openpgp" "setup.scm")
      (in-srcdir "tests" "openpgp" "setup.scm")
      (string-append "--" variant))))
 
@@ -62,7 +64,8 @@
  (define tests
    (map (lambda (name)
 	  (test::scm setup
-		     (qualify (path-join "tests" "openpgp" name) "standard")
+		     "standard"
+		     (path-join "tests" "openpgp" name)
 		     (in-srcdir "tests" "openpgp" name))) all-tests))
 
  (when *run-all-tests*
@@ -73,17 +76,16 @@
 	      (if keyboxd-enabled?
 		  (map (lambda (name)
 			 (test::scm setup-use-keyboxd
-				    (qualify (path-join "tests" "openpgp" name)
-					     "keyboxd")
+				    "keyboxd"
+				    (path-join "tests" "openpgp" name)
 				    (in-srcdir "tests" "openpgp" name)
 				    "--use-keyboxd")) all-tests))
 	      ;; The third pass uses the legact pubring.gpg
 	      (map (lambda (name)
 		     (test::scm setup-use-keyring
-				(qualify (path-join "tests" "openpgp" name)
-					 "keyring")
+				"keyring"
+				(path-join "tests" "openpgp" name)
 				(in-srcdir "tests" "openpgp" name)
-				"--use-keyring")) all-tests)
-	      )))
+				"--use-keyring")) all-tests))))
 
  tests)
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index 8f9435943..faf52d80b 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -29,6 +29,7 @@
 (define setup
   (make-environment-cache (test::scm
 			   #f
+			   #f
 			   (path-join "tests" "openpgp" "setup.scm")
 			   (in-srcdir "tests" "openpgp" "setup.scm"))))
 
@@ -55,11 +56,12 @@
                (if use-keyboxd?
 	           (map (lambda (name)
 		          (test::scm setup-use-keyboxd
-				     (qualify (path-join "tests" "openpgp" name)
-					      "keyboxd")
+				     "keyboxd"
+				     (path-join "tests" "openpgp" name)
 				     (in-srcdir "tests" "openpgp" name)
                                      "--use-keyboxd")) tests)
 	           (map (lambda (name)
 		          (test::scm setup
+				     #f
 				     (path-join "tests" "openpgp" name)
 				     (in-srcdir "tests" "openpgp" name))) tests))))