Skip to content

Commit 2c6f26b

Browse files
committed
implement feedback
1 parent e334b74 commit 2c6f26b

File tree

2 files changed

+39
-13
lines changed

2 files changed

+39
-13
lines changed

v1.0/conformance_test_v1.0.yaml

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -984,22 +984,49 @@
984984

985985
- job: v1.0/recursive-input-directory.json
986986
output:
987-
"outdir": {
987+
output_dir: {
988+
"basename": "work_dir",
988989
"class": "Directory",
989990
"listing": [
990991
{
991-
"class": "File",
992-
"location": "hello.txt",
993-
"checksum": "sha1$47a013e660d408619d894b20806b1d5086aab03b",
994-
"size": 13
992+
"basename": "a",
993+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
994+
"class": "File",
995+
"location": "work_dir/a",
996+
"size": 0
995997
},
996998
{
997-
"class": "File",
998-
"location": "goodbye.txt",
999-
"checksum": "sha1$dd0a4c4c49ba43004d6611771972b6cf969c1c01",
1000-
"size": 24
999+
"basename": "b",
1000+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1001+
"class": "File",
1002+
"location": "work_dir/b",
1003+
"size": 0
1004+
},
1005+
{
1006+
"basename": "c",
1007+
"class": "Directory",
1008+
"listing": [
1009+
{
1010+
"basename": "d",
1011+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1012+
"class": "File",
1013+
"location": "work_dir/c/d",
1014+
"size": 0
1015+
}
1016+
],
1017+
"location": "file:///Users/gijs/Work/common-workflow-language/v1.0R35DHF/work_dir/c",
1018+
},
1019+
{
1020+
"basename": "e",
1021+
"checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
1022+
"class": "File",
1023+
"location": "work_dir/e",
1024+
"size": 0
10011025
}
10021026
],
1027+
"location": "work_dir",
10031028
}
1004-
tool: v1.0/recursive-input-directory.yml
1029+
1030+
1031+
tool: v1.0/recursive-input-directory.cwl
10051032
doc: Test if a writable input directory is recursivly copied and writable

v1.0/v1.0/recursive-input-directory.yml renamed to v1.0/v1.0/recursive-input-directory.cwl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ requirements:
77
- entry: $(inputs.input_dir)
88
entryname: work_dir
99
writable: true
10-
baseCommand: "touch"
11-
arguments: [$(inputs.input_dir.path + "/e")]
10+
baseCommand: [touch, work_dir/e]
1211
inputs:
1312
input_dir: Directory
1413
outputs:
1514
output_dir:
1615
type: Directory
1716
outputBinding:
18-
glob: $(inputs.input_dir)
17+
glob: work_dir

0 commit comments

Comments
 (0)