From c2c22bc3a215e2a0d57c976a9aa337df95297ba1 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 24 Aug 2025 17:48:54 +0100 Subject: guix: Work with a test suite interned to the store. Instead of cwl-v1.2-conformance being a script that accepts a path to the CWL v1.2 conformance test suite, we now work with a CWL v1.2 repo origin object. This is more declarative, and there is no need for manual cloning of the cwl-v1.2 git repo on the CI. The CI merely has to run a script with no arguments. This provides more control here in the ravanan repo and less configuration on the CI server. We do likewise for the end-to-end tests. In this case, we work with files from the ravanan repo, but have to first compile ccwl sources to CWL workflows. --- e2e-tests/.gitignore | 1 - e2e-tests/Makefile | 37 ------------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 e2e-tests/.gitignore delete mode 100644 e2e-tests/Makefile (limited to 'e2e-tests') diff --git a/e2e-tests/.gitignore b/e2e-tests/.gitignore deleted file mode 100644 index 321232f..0000000 --- a/e2e-tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tools/*.cwl \ No newline at end of file diff --git a/e2e-tests/Makefile b/e2e-tests/Makefile deleted file mode 100644 index 1410a6d..0000000 --- a/e2e-tests/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# ravanan --- High-reproducibility CWL runner powered by Guix -# Copyright © 2025 Arun Isaac -# -# This file is part of ravanan. -# -# ravanan 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. -# -# ravanan 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 ravanan. If not, see . - -CCWL ?= ccwl -CWLTEST ?= cwltest - -tools_directory = tools -tool_ccwl = $(wildcard $(tools_directory)/*.scm) -tool_cwl = $(tool_ccwl:.scm=.cwl) - -all: $(tool_cwl) - -%.cwl: %.scm - $(CCWL) compile $^ > $@ - -.PHONY: check clean -check: - mkdir -p /tmp/cwltest-tmpdir - TMPDIR=/tmp/cwltest-tmpdir ../pre-inst-env $(CWLTEST) --test tests.yaml --tool ravanan -- --store=store --guix-manifest=manifest.scm - -clean: - rm -f $(tool_cwl) -- cgit 1.4.1