From c41a2d37f09c7e479640521baf2a612f6a77669f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 15 Nov 2025 20:52:05 +0000 Subject: guix: Accept additional cwltest arguments. --- .guix/cwl-conformance.scm | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/.guix/cwl-conformance.scm b/.guix/cwl-conformance.scm index 3e25c71..b71821e 100644 --- a/.guix/cwl-conformance.scm +++ b/.guix/cwl-conformance.scm @@ -35,26 +35,29 @@ (use-modules (guix build utils) (ice-9 match)) - ;; Guix peeks into HOME. - (setenv "HOME" (getcwd)) - ;; cwltest writes out output directories to TMPDIR, but does not clean - ;; up after. So, we set TMPDIR to our own temporary directory that we - ;; can manage easily. See pending issue on cleaning up temporary output - ;; directories: - ;; https://github.com/common-workflow-language/cwltest/issues/249 - (mkdir "tmpdir") - (setenv "TMPDIR" "tmpdir") - (apply invoke - #$(file-append cwltest "/bin/cwltest") - "--test" #$cwltest-suite - "--tool" #$(file-append ravanan "/bin/ravanan") - "--badgedir" "badges" - (append '#$(match skip-tests - (() '()) - (_ (list "-S" (string-join skip-tests ",")))) - (list "--" - "--store=store" - (string-append "--guix-manifest=" #$manifest-file))))))) + (match (command-line) + ((_ cwltest-args ...) + ;; Guix peeks into HOME. + (setenv "HOME" (getcwd)) + ;; cwltest writes out output directories to TMPDIR, but does not + ;; clean up after. So, we set TMPDIR to our own temporary directory + ;; that we can manage easily. See pending issue on cleaning up + ;; temporary output directories: + ;; https://github.com/common-workflow-language/cwltest/issues/249 + (mkdir "tmpdir") + (setenv "TMPDIR" "tmpdir") + (apply invoke + #$(file-append cwltest "/bin/cwltest") + "--test" #$cwltest-suite + "--tool" #$(file-append ravanan "/bin/ravanan") + "--badgedir" "badges" + (append '#$(match skip-tests + (() '()) + (_ (list "-S" (string-join skip-tests ",")))) + cwltest-args + (list "--" + "--store=store" + (string-append "--guix-manifest=" #$manifest-file))))))))) (define cwl-v1.2-conformance-suite (let ((version "1.2.1")) -- cgit 1.4.1