From fc4cb0fb19a082c123b88b9424378086559823e8 Mon Sep 17 00:00:00 2001 From: boysha Date: Sun, 30 Oct 2016 23:11:59 +0100 Subject: [PATCH 1/2] Added args output and empty.json for null jobs --- v1.0/conformance_test_v1.0.yaml | 6 +++--- v1.0/v1.0/binding-test.cwl | 3 ++- v1.0/v1.0/cat1-testcli.cwl | 2 +- v1.0/v1.0/tmap-tool.cwl | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml index 365e752f4..bc175ae97 100644 --- a/v1.0/conformance_test_v1.0.yaml +++ b/v1.0/conformance_test_v1.0.yaml @@ -77,7 +77,7 @@ tool: v1.0/cat3-tool-mediumcut.cwl doc: Test command execution in Docker with stdout redirection -- job: +- job: v1.0/empty.json tool: v1.0/egrep-stderr.cwl doc: Test command line with stderr redirection output: @@ -87,7 +87,7 @@ size: 84 location: error.txt -- job: +- job: v1.0/empty.json tool: v1.0/egrep-stderr-shortcut.cwl doc: Test command line with stderr redirection, brief syntax output: @@ -103,7 +103,7 @@ size: 84 checksum: sha1$cec7b8746a78c42060c96505887449bca0142976 location: std.err - job: + job: v1.0/empty.json tool: v1.0/egrep-stderr-mediumcut.cwl doc: Test command line with stderr redirection, named brief syntax diff --git a/v1.0/v1.0/binding-test.cwl b/v1.0/v1.0/binding-test.cwl index 8415dc414..99f812fb1 100755 --- a/v1.0/v1.0/binding-test.cwl +++ b/v1.0/v1.0/binding-test.cwl @@ -23,7 +23,8 @@ inputs: inputBinding: position: -1 -outputs: [] +outputs: + args: string[] baseCommand: python arguments: ["bwa", "mem"] diff --git a/v1.0/v1.0/cat1-testcli.cwl b/v1.0/v1.0/cat1-testcli.cwl index 06782c2b9..9558ed82c 100755 --- a/v1.0/v1.0/cat1-testcli.cwl +++ b/v1.0/v1.0/cat1-testcli.cwl @@ -29,7 +29,7 @@ } } ], - "outputs": [], + "outputs": [{"id": "args", "type": "string[]"}], "baseCommand": "python", "arguments": ["cat"] } diff --git a/v1.0/v1.0/tmap-tool.cwl b/v1.0/v1.0/tmap-tool.cwl index 1cb08428b..505d60036 100755 --- a/v1.0/v1.0/tmap-tool.cwl +++ b/v1.0/v1.0/tmap-tool.cwl @@ -38,7 +38,8 @@ "glob": "output.sam" }, "type": ["null", "File"] - } + }, + {"id": "args", "type": "string[]"} ], "requirements": [ {"class": "SchemaDefRequirement", From dee0f4eeeca4a8515c70bb9e30404d0abd86855d Mon Sep 17 00:00:00 2001 From: boysha Date: Mon, 31 Oct 2016 00:08:00 +0100 Subject: [PATCH 2/2] Disabled checksum check for listing input dir --- v1.0/conformance_test_v1.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml index bc175ae97..93ae87073 100644 --- a/v1.0/conformance_test_v1.0.yaml +++ b/v1.0/conformance_test_v1.0.yaml @@ -789,8 +789,8 @@ - job: v1.0/dir4-job.yml output: { "outlist": { - "checksum": "sha1$2ab6f189e84753c05a23413fbf6b6fbf4c53489f", - "size": 90, +# "checksum": "sha1$2ab6f189e84753c05a23413fbf6b6fbf4c53489f", +# "size": 90, "location": "output.txt", "class": "File" }