From 17f98d56973506fad6e7a75c4458464658b4e03e Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Wed, 1 Jul 2026 14:51:43 +0100
Subject: tests: Simplify external CWL workflow relative path test.

---
 test-data/echo.cwl                  | 7 -------
 test-data/external-cwl-workflow.scm | 7 -------
 tests/ccwl.scm                      | 3 +++
 tests/echo.cwl                      | 7 +++++++
 tests/lang.scm                      | 3 ---
 5 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 test-data/echo.cwl
 delete mode 100644 test-data/external-cwl-workflow.scm
 create mode 100644 tests/echo.cwl

diff --git a/test-data/echo.cwl b/test-data/echo.cwl
deleted file mode 100644
index b957a59..0000000
--- a/test-data/echo.cwl
+++ /dev/null
@@ -1,7 +0,0 @@
-cwlVersion: v1.2
-class: CommandLineTool
-baseCommand: echo
-inputs:
-  message:
-    type: string
-outputs: {}
diff --git a/test-data/external-cwl-workflow.scm b/test-data/external-cwl-workflow.scm
deleted file mode 100644
index 74c91c1..0000000
--- a/test-data/external-cwl-workflow.scm
+++ /dev/null
@@ -1,7 +0,0 @@
-(define echo
-  (cwl-workflow "echo.cwl"))
-
-;; TODO: Remove this workflow and return echo directly once bug
-;; a9352f5 is fixed.
-(workflow ((message #:type string))
-  (echo #:message "foo"))
diff --git a/tests/ccwl.scm b/tests/ccwl.scm
index 38a8302..b2da5cd 100644
--- a/tests/ccwl.scm
+++ b/tests/ccwl.scm
@@ -63,6 +63,9 @@
              #:stdin file))
    'inputs))
 
+(test-assert "resolve CWL workflow relative to source file"
+  (cwl-workflow "echo.cwl"))
+
 (test-equal "read all forms of inputs and outputs from a CWL workflow"
   '(((spam string))
     ((ham stdout)
diff --git a/tests/echo.cwl b/tests/echo.cwl
new file mode 100644
index 0000000..b957a59
--- /dev/null
+++ b/tests/echo.cwl
@@ -0,0 +1,7 @@
+cwlVersion: v1.2
+class: CommandLineTool
+baseCommand: echo
+inputs:
+  message:
+    type: string
+outputs: {}
diff --git a/tests/lang.scm b/tests/lang.scm
index d8a891b..5c506bc 100644
--- a/tests/lang.scm
+++ b/tests/lang.scm
@@ -23,9 +23,6 @@
 
 (test-begin "lang")
 
-(test-assert "load source file referencing external CWL workflow relative to it"
-  (ccwl-load "test-data/external-cwl-workflow.scm"))
-
 (test-condition "loading non-existent source file must raise a &ccwl-violation"
   ccwl-violation?
   (ccwl-load "/non-existent/file.scm"))
-- 
cgit 1.4.1