Skip to content

Commit a808742

Browse files
author
Peter Amstutz
committed
Add tests that ShellCommandRequirement quote properly.
1 parent 4573403 commit a808742

File tree

4 files changed

+64
-0
lines changed

4 files changed

+64
-0
lines changed

v1.0/conformance_test_v1.0.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -999,3 +999,21 @@
999999
}
10001000
tool: v1.0/shellchar.cwl
10011001
doc: "Test that shell directives are not interpreted."
1002+
1003+
- job: v1.0/empty.json
1004+
output: {
1005+
"stderr_file": {
1006+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1007+
"location": Any,
1008+
"class": "File",
1009+
"size": 0
1010+
},
1011+
"stdout_file": {
1012+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1013+
"location": Any,
1014+
"class": "File",
1015+
"size": 9
1016+
}
1017+
}
1018+
tool: v1.0/shellchar2.cwl
1019+
doc: "Test that shell directives are quoted."

v1.0/v1.0/shellchar2.cwl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env cwl-runner
2+
class: CommandLineTool
3+
cwlVersion: v1.0
4+
doc: |
5+
Ensure that `shellQuote: true` is the default behavior when
6+
ShellCommandRequirement is in effect.
7+
requirements:
8+
ShellCommandRequirement: {}
9+
inputs: []
10+
outputs:
11+
stdout_file: stdout
12+
stderr_file: stderr
13+
baseCommand: echo
14+
arguments: ["foo 1>&2"]

v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,3 +1010,21 @@
10101010
}
10111011
tool: v1.1.0-dev1/shellchar.cwl
10121012
doc: "Test that shell directives are not interpreted."
1013+
1014+
- job: v1.1.0-dev1/empty.json
1015+
output: {
1016+
"stderr_file": {
1017+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1018+
"location": Any,
1019+
"class": "File",
1020+
"size": 0
1021+
},
1022+
"stdout_file": {
1023+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1024+
"location": Any,
1025+
"class": "File",
1026+
"size": 9
1027+
}
1028+
}
1029+
tool: v1.1.0-dev1/shellchar2.cwl
1030+
doc: "Test that shell directives are quoted."
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env cwl-runner
2+
class: CommandLineTool
3+
cwlVersion: v1.1.0-dev1
4+
doc: |
5+
Ensure that `shellQuote: true` is the default behavior when
6+
ShellCommandRequirement is in effect.
7+
requirements:
8+
ShellCommandRequirement: {}
9+
inputs: []
10+
outputs:
11+
stdout_file: stdout
12+
stderr_file: stderr
13+
baseCommand: echo
14+
arguments: ["foo 1>&2"]

0 commit comments

Comments
 (0)