diff options
| author | NIIBE Yutaka <[email protected]> | 2022-11-24 06:22:32 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2022-11-24 06:57:25 +0000 |
| commit | 1246e16432b4240ad81c0bd757d7458b609dfd96 (patch) | |
| tree | 15a7f1db3c4bca7434f37e2d9fcb1e8ff773b444 /tests/gpgscm | |
| parent | tests:w32: Fix for non-dot file name for Windows. (diff) | |
| download | gnupg-1246e16432b4240ad81c0bd757d7458b609dfd96.tar.gz gnupg-1246e16432b4240ad81c0bd757d7458b609dfd96.zip | |
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]>
Diffstat (limited to 'tests/gpgscm')
| -rw-r--r-- | tests/gpgscm/tests.scm | 17 |
1 files changed, 11 insertions, 6 deletions
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 |