Skip to content

Commit 4573403

Browse files
author
Peter Amstutz
committed
Add test to ensure that arguments containing shell directives are not interpreted and that shellQuote: false has no effect when ShellCommandRequirement is not in effect.
1 parent aa44386 commit 4573403

File tree

4 files changed

+62
-0
lines changed

4 files changed

+62
-0
lines changed

v1.0/conformance_test_v1.0.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,3 +981,21 @@
981981
size: 15
982982
tool: v1.0/imported-hint.cwl
983983
doc: Test hints with $import
984+
985+
- job: v1.0/empty.json
986+
output: {
987+
"stderr_file": {
988+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
989+
"location": Any,
990+
"class": "File",
991+
"size": 0
992+
},
993+
"stdout_file": {
994+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
995+
"location": Any,
996+
"class": "File",
997+
"size": 9
998+
}
999+
}
1000+
tool: v1.0/shellchar.cwl
1001+
doc: "Test that shell directives are not interpreted."

v1.0/v1.0/shellchar.cwl

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

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
@@ -992,3 +992,21 @@
992992
size: 15
993993
tool: v1.1.0-dev1/imported-hint.cwl
994994
doc: Test hints with $import
995+
996+
- job: v1.1.0-dev1/empty.json
997+
output: {
998+
"stderr_file": {
999+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1000+
"location": Any,
1001+
"class": "File",
1002+
"size": 0
1003+
},
1004+
"stdout_file": {
1005+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1006+
"location": Any,
1007+
"class": "File",
1008+
"size": 9
1009+
}
1010+
}
1011+
tool: v1.1.0-dev1/shellchar.cwl
1012+
doc: "Test that shell directives are not interpreted."

v1.1.0-dev1/v1.1.0-dev1/shellchar.cwl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env cwl-runner
2+
class: CommandLineTool
3+
cwlVersion: v1.1.0-dev1
4+
doc: |
5+
Ensure that arguments containing shell directives are not interpreted and
6+
that `shellQuote: false` has no effect when ShellCommandRequirement is not in
7+
effect.
8+
inputs: []
9+
outputs:
10+
stdout_file: stdout
11+
stderr_file: stderr
12+
baseCommand: echo
13+
arguments: [{valueFrom: "foo 1>&2", shellQuote: false}]

0 commit comments

Comments
 (0)