Skip to content

Commit 9d0fbe0

Browse files
committed
initial stdout & stderr shortcut support
1 parent 392be2f commit 9d0fbe0

File tree

2 files changed

+69
-0
lines changed

2 files changed

+69
-0
lines changed

draft-4/Process.yml

+32
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,36 @@ $graph:
138138
# type: ["null", long]
139139
# doc: Optional directory size.
140140

141+
- name: stdout
142+
type: record
143+
doc: |
144+
Only valid as a `type` for an output.
145+
146+
The following
147+
```
148+
outputs:
149+
an_output_name:
150+
type: stdout
151+
152+
stdout: a_stdout_file
153+
```
154+
is equivalent to
155+
```
156+
outputs:
157+
an_output_name:
158+
type: File
159+
outputBinding:
160+
glob: a_stdout_file
161+
162+
stdout: a_stdout_file
163+
```
164+
165+
If there is no `stdout` name provided, a random filename will be created.
166+
167+
168+
- name: stderr
169+
type: record
170+
doc: Only valid as a `type` for an output.
141171

142172
- name: SchemaBase
143173
type: record
@@ -213,6 +243,8 @@ $graph:
213243
type:
214244
- "null"
215245
- "#CWLType"
246+
- "#stdout"
247+
- "#stderr"
216248
- "sld:RecordSchema"
217249
- "sld:EnumSchema"
218250
- "sld:ArraySchema"

draft-4/conformance_test_draft-4.yaml

+37
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,43 @@
5757
tool: draft-4/cat3-tool.cwl
5858
doc: Test command execution in Docker with stdout redirection
5959

60+
- job: draft-4/cat-job.json
61+
tool: draft-4/cat3-tool-shortcut.cwl
62+
doc: Test command execution in Docker with stdout redirection
63+
64+
- job: draft-4/cat-job.json
65+
output:
66+
output_file:
67+
class: File
68+
checksum: sha1$47a013e660d408619d894b20806b1d5086aab03b
69+
path: cat-out
70+
size: 13
71+
tool: draft-4/cat3-tool-mediumcut.cwl
72+
doc: Test command execution in Docker with stdout redirection
73+
74+
- args: [egrep]
75+
stderr: error.txt
76+
job:
77+
tool: draft-4/egrep-stderr.cwl
78+
doc: Test command line with stderr redirection
79+
80+
- args: [egrep]
81+
job:
82+
tool: draft-4/egrep-stderr-shortcut.cwl
83+
doc: Test command line with stderr redirection, brief syntax
84+
85+
- args: [egrep]
86+
stderr: std.err
87+
output:
88+
output_file:
89+
class: File
90+
size: 84
91+
checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
92+
path: std.err
93+
job:
94+
tool: draft-4/egrep-stderr-mediumcut.cwl
95+
doc: Test command line with stderr redirection, named brief syntax
96+
6097
- job: draft-4/cat-job.json
6198
output:
6299
output_txt:

0 commit comments

Comments
 (0)