Skip to content

Commit 0ad5a58

Browse files
author
Peter Amstutz
committed
Merge branch 'shellchar' into v1.0-errata
2 parents ab4a189 + a808742 commit 0ad5a58

File tree

6 files changed

+126
-0
lines changed

6 files changed

+126
-0
lines changed

‎v1.0/conformance_test_v1.0.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,3 +1123,39 @@
11231123
result: 12
11241124
tool: v1.0/sum-wf.cwl
11251125
doc: Test step input with multiple sources with multiple types
1126+
1127+
- job: v1.0/empty.json
1128+
output: {
1129+
"stderr_file": {
1130+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1131+
"location": Any,
1132+
"class": "File",
1133+
"size": 0
1134+
},
1135+
"stdout_file": {
1136+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1137+
"location": Any,
1138+
"class": "File",
1139+
"size": 9
1140+
}
1141+
}
1142+
tool: v1.0/shellchar.cwl
1143+
doc: "Test that shell directives are not interpreted."
1144+
1145+
- job: v1.0/empty.json
1146+
output: {
1147+
"stderr_file": {
1148+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1149+
"location": Any,
1150+
"class": "File",
1151+
"size": 0
1152+
},
1153+
"stdout_file": {
1154+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1155+
"location": Any,
1156+
"class": "File",
1157+
"size": 9
1158+
}
1159+
}
1160+
tool: v1.0/shellchar2.cwl
1161+
doc: "Test that shell directives are quoted."

‎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.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: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,3 +1082,39 @@
10821082
job: v1.1.0-dev1/cat-job.json
10831083
tool: v1.1.0-dev1/null-defined.cwl
10841084
doc: Test that provided parameter is not null in expression
1085+
1086+
- job: v1.1.0-dev1/empty.json
1087+
output: {
1088+
"stderr_file": {
1089+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1090+
"location": Any,
1091+
"class": "File",
1092+
"size": 0
1093+
},
1094+
"stdout_file": {
1095+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1096+
"location": Any,
1097+
"class": "File",
1098+
"size": 9
1099+
}
1100+
}
1101+
tool: v1.1.0-dev1/shellchar.cwl
1102+
doc: "Test that shell directives are not interpreted."
1103+
1104+
- job: v1.1.0-dev1/empty.json
1105+
output: {
1106+
"stderr_file": {
1107+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1108+
"location": Any,
1109+
"class": "File",
1110+
"size": 0
1111+
},
1112+
"stdout_file": {
1113+
"checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
1114+
"location": Any,
1115+
"class": "File",
1116+
"size": 9
1117+
}
1118+
}
1119+
tool: v1.1.0-dev1/shellchar2.cwl
1120+
doc: "Test that shell directives are quoted."

‎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}]

‎v1.1.0-dev1/v1.1.0-dev1/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.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)