about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--test-data/external-cwl-workflow.scm7
-rw-r--r--tests/ccwl.scm3
-rw-r--r--tests/echo.cwl (renamed from test-data/echo.cwl)0
-rw-r--r--tests/lang.scm3
4 files changed, 3 insertions, 10 deletions
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/test-data/echo.cwl b/tests/echo.cwl
index b957a59..b957a59 100644
--- a/test-data/echo.cwl
+++ b/tests/echo.cwl
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"))