implement feedback

common-workflow-language · Feb 14, 2017 · 2c6f26b · 2c6f26b
1 parent e334b74
commit 2c6f26b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 13 deletions.
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -984,22 +984,49 @@
 
 - job: v1.0/recursive-input-directory.json
   output:
-    "outdir": {
+   output_dir: {
+        "basename": "work_dir",
         "class": "Directory",
         "listing": [
             {
-              "class": "File",
-              "location": "hello.txt",
-                "checksum": "sha1$47a013e660d408619d894b20806b1d5086aab03b",
-                "size": 13
+                "basename": "a",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "class": "File",
+                "location": "work_dir/a",
+                "size": 0
             },
             {
-              "class": "File",
-              "location": "goodbye.txt",
-                "checksum": "sha1$dd0a4c4c49ba43004d6611771972b6cf969c1c01",
-                "size": 24
+                "basename": "b",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "class": "File",
+                "location": "work_dir/b",
+                "size": 0
+            },
+            {
+                "basename": "c",
+                "class": "Directory",
+                "listing": [
+                    {
+                        "basename": "d",
+                        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                        "class": "File",
+                        "location": "work_dir/c/d",
+                        "size": 0
+                    }
+                ],
+                "location": "file:///Users/gijs/Work/common-workflow-language/v1.0R35DHF/work_dir/c",
+            },
+            {
+                "basename": "e",
+                "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+                "class": "File",
+                "location": "work_dir/e",
+                "size": 0
             }
         ],
+        "location": "work_dir",
     }
-  tool: v1.0/recursive-input-directory.yml
+
+
+  tool: v1.0/recursive-input-directory.cwl
   doc: Test if a writable input directory is recursivly copied and writable
diff --git a/v1.0/v1.0/recursive-input-directory.yml → v1.0/v1.0/recursive-input-directory.cwl b/v1.0/v1.0/recursive-input-directory.yml → v1.0/v1.0/recursive-input-directory.cwl
@@ -7,12 +7,11 @@ requirements:
       - entry: $(inputs.input_dir)
         entryname: work_dir
         writable: true
-baseCommand: "touch"
-arguments: [$(inputs.input_dir.path + "/e")]
+baseCommand: [touch, work_dir/e]
 inputs:
   input_dir: Directory
 outputs:
   output_dir:
     type: Directory
     outputBinding:
-      glob: $(inputs.input_dir)
+      glob: work_dir