Merge remote-tracking branch 'rabix-cwl/master'

qiukunlong · Nov 2, 2016 · 83ed4b4 · 83ed4b4
2 parents e0a5e7c + dee0f4e
commit 83ed4b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -38,7 +38,8 @@
                 "glob": "output.sam"
             },
             "type": ["null", "File"]
-        }
+        },
+        {"id": "args", "type": "string[]"}
     ],
     "requirements": [
     {"class": "SchemaDefRequirement",