Merge pull request common-workflow-language#426 from common-workflow-…

…language/fix-wc-test Fix wc test
manu-chroma · Apr 11, 2017 · e150035 · e150035
2 parents f2ea521 + 6acb016
commit e150035
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 16 deletions.
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -155,10 +155,10 @@
 - job: v1.0/wc-job.json
   output:
     output:
+      checksum: sha1$3596ea087bfdaf52380eae441077572ed289d657
       class: File
-      checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
       location: output
-      size: 15
+      size: 3
   tool: v1.0/wc-tool.cwl
   doc: Test command execution in with stdin and stdout redirection
 

diff --git a/v1.0/v1.0/count-lines10-wf.cwl b/v1.0/v1.0/count-lines10-wf.cwl
@@ -13,7 +13,6 @@ steps:
     out: [count_output]
     run:
       class: Workflow
-      id: subwf
       inputs:
         file1: File
       outputs:

diff --git a/v1.0/v1.0/count-lines2-wf.cwl b/v1.0/v1.0/count-lines2-wf.cwl
@@ -39,7 +39,6 @@ steps:
     out: [parseInt_output]
     run:
       class: ExpressionTool
-      id: subtool
       inputs:
         parseInt_file1:
           type: File

diff --git a/v1.0/v1.0/scatter-valuefrom-wf1.cwl b/v1.0/v1.0/scatter-valuefrom-wf1.cwl
@@ -35,7 +35,6 @@ steps:
     scatter: echo_in
     run:
       class: CommandLineTool
-      id: subtool
       inputs:
         first:
           type: string

diff --git a/v1.0/v1.0/scatter-valuefrom-wf5.cwl b/v1.0/v1.0/scatter-valuefrom-wf5.cwl
@@ -35,7 +35,6 @@ steps:
     scatter: echo_in
     run:
       class: CommandLineTool
-      id: subtool
       inputs:
         first:
           type: string

diff --git a/v1.0/v1.0/scatter-wf1.cwl b/v1.0/v1.0/scatter-wf1.cwl
@@ -19,7 +19,6 @@ steps:
     scatter: echo_in
     run:
       class: CommandLineTool
-      id: subtool
       inputs:
         echo_in:
           type: string

diff --git a/v1.0/v1.0/wc-tool.cwl b/v1.0/v1.0/wc-tool.cwl
@@ -11,7 +11,7 @@ outputs:
     type: File
     outputBinding: { glob: output }
 
-baseCommand: [wc]
+baseCommand: [wc, -l]
 
 stdin: $(inputs.file1.path)
 stdout: output
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
@@ -166,10 +166,10 @@
 - job: v1.1.0-dev1/wc-job.json
   output:
     output:
+      checksum: sha1$3596ea087bfdaf52380eae441077572ed289d657
       class: File
-      checksum: sha1$631bfbac524e2d04cdcc5ec33ade827fc10b06ae
       location: output
-      size: 15
+      size: 3
   tool: v1.1.0-dev1/wc-tool.cwl
   doc: Test command execution in with stdin and stdout redirection
 

diff --git a/v1.1.0-dev1/v1.1.0-dev1/count-lines10-wf.cwl b/v1.1.0-dev1/v1.1.0-dev1/count-lines10-wf.cwl
@@ -13,7 +13,6 @@ steps:
     out: [count_output]
     run:
       class: Workflow
-      id: subwf
       inputs:
         file1: File
       outputs:

diff --git a/v1.1.0-dev1/v1.1.0-dev1/count-lines2-wf.cwl b/v1.1.0-dev1/v1.1.0-dev1/count-lines2-wf.cwl
@@ -39,7 +39,6 @@ steps:
     out: [parseInt_output]
     run:
       class: ExpressionTool
-      id: subtool
       inputs:
         parseInt_file1:
           type: File

diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-valuefrom-wf1.cwl b/v1.1.0-dev1/v1.1.0-dev1/scatter-valuefrom-wf1.cwl
@@ -35,7 +35,6 @@ steps:
     scatter: echo_in
     run:
       class: CommandLineTool
-      id: subtool
       inputs:
         first:
           type: string

diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-valuefrom-wf5.cwl b/v1.1.0-dev1/v1.1.0-dev1/scatter-valuefrom-wf5.cwl
@@ -35,7 +35,6 @@ steps:
     scatter: echo_in
     run:
       class: CommandLineTool
-      id: subtool
       inputs:
         first:
           type: string

diff --git a/v1.1.0-dev1/v1.1.0-dev1/scatter-wf1.cwl b/v1.1.0-dev1/v1.1.0-dev1/scatter-wf1.cwl
@@ -19,7 +19,6 @@ steps:
     scatter: echo_in
     run:
       class: CommandLineTool
-      id: subtool
       inputs:
         echo_in:
           type: string

diff --git a/v1.1.0-dev1/v1.1.0-dev1/wc-tool.cwl b/v1.1.0-dev1/v1.1.0-dev1/wc-tool.cwl
@@ -11,7 +11,7 @@ outputs:
     type: File
     outputBinding: { glob: output }
 
-baseCommand: [wc]
+baseCommand: [wc, -l]
 
 stdin: $(inputs.file1.path)
 stdout: output