From 6acb016e37d9ab839d82b0c063f784edb674dc12 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 11 Apr 2017 13:33:10 -0400
Subject: [PATCH] Fix wc test by using wc -l to avoid padding issues on
 different implementions of 'wc' (!)

---
 v1.0/conformance_test_v1.0.yaml               | 4 ++--
 v1.0/v1.0/wc-tool.cwl                         | 2 +-
 v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml | 4 ++--
 v1.1.0-dev1/v1.1.0-dev1/wc-tool.cwl           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
index 420f973f8..e5db1d006 100644
--- 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/wc-tool.cwl b/v1.0/v1.0/wc-tool.cwl
index d6265afb0..165585494 100755
--- 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
index ec8c2fe2e..9481e8339 100644
--- 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/wc-tool.cwl b/v1.1.0-dev1/v1.1.0-dev1/wc-tool.cwl
index fba3e6aa6..cd12b3c06 100755
--- 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