added v1.0 jobs, and fixed v1.1 paths

common-workflow-language · May 5, 2017 · f4fe77f · f4fe77f
1 parent 35dc6c5
commit f4fe77f
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/v1.0/v1.0/scatter-empty-job1.json b/v1.0/v1.0/scatter-empty-job1.json
@@ -0,0 +1,3 @@
+{
+  "inp": []
+}
diff --git a/v1.0/v1.0/scatter-empty-job2.json b/v1.0/v1.0/scatter-empty-job2.json
@@ -0,0 +1,4 @@
+{
+  "inp1": ["one", "two"],
+  "inp2": []
+}
diff --git a/v1.0/v1.0/scatter-empty-job3.json b/v1.0/v1.0/scatter-empty-job3.json
@@ -0,0 +1,4 @@
+{
+  "inp1": [],
+  "inp2": ["one", "two"]
+}
diff --git a/v1.0/v1.0/scatter-empty-job4.json b/v1.0/v1.0/scatter-empty-job4.json
@@ -0,0 +1,4 @@
+{
+  "inp1": [],
+  "inp2": []
+}
diff --git a/v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml b/v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml
@@ -267,34 +267,34 @@
   tool: "v1.1.0-dev1/scatter-wf4.cwl#main"
   doc: Test workflow scatter with two scatter parameters and dotproduct join method
 
-- job: v1.0/scatter-empty-job1.json
+- job: v1.1.0-dev1/scatter-empty-job1.json
   output:
     out: []
-  tool: v1.0/scatter-wf1.cwl
+  tool: v1.1.0-dev1/scatter-wf1.cwl
   doc: Test workflow scatter with single empty list parameter
 
-- job: v1.0/scatter-empty-job2.json
+- job: v1.1.0-dev1/scatter-empty-job2.json
   output:
     out: [[], []]
-  tool: v1.0/scatter-wf2.cwl
+  tool: v1.1.0-dev1/scatter-wf2.cwl
   doc: Test workflow scatter with two scatter parameters and nested_crossproduct join method with second list empty
 
-- job: v1.0/scatter-empty-job3.json
+- job: v1.1.0-dev1/scatter-empty-job3.json
   output:
     out: []
-  tool: "v1.0/scatter-wf3.cwl#main"
+  tool: "v1.1.0-dev1/scatter-wf3.cwl#main"
   doc: Test workflow scatter with two scatter parameters and nested_crossproduct join method with first list empty
 
-- job: v1.0/scatter-empty-job2.json
+- job: v1.1.0-dev1/scatter-empty-job2.json
   output:
     out: []
-  tool: "v1.0/scatter-wf3.cwl#main"
+  tool: "v1.1.0-dev1/scatter-wf3.cwl#main"
   doc: Test workflow scatter with two scatter parameters, one of which is empty and flat_crossproduct join method
 
-- job: v1.0/scatter-empty-job4.json
+- job: v1.1.0-dev1/scatter-empty-job4.json
   output:
     out: []
-  tool: "v1.0/scatter-wf4.cwl#main"
+  tool: "v1.1.0-dev1/scatter-wf4.cwl#main"
   doc: Test workflow scatter with two empty scatter parameters and dotproduct join method
 
 - tool: v1.1.0-dev1/echo-tool.cwl