From 8ab5eb9e64dbaa8652fbe4441340fc5da4cc381c Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 2 Mar 2017 16:20:45 -0500
Subject: [PATCH] stderr redirect tests use "echo" instead of checking for the
 usage message of "egrep".

---
 v1.0/conformance_test_v1.0.yaml                | 18 +++++++++---------
 ...derr-mediumcut.cwl => stderr-mediumcut.cwl} | 10 +---------
 ...stderr-shortcut.cwl => stderr-shortcut.cwl} |  9 +--------
 v1.0/v1.0/{egrep-stderr.cwl => stderr.cwl}     |  6 +-----
 v1.1.0-dev1/conformance_test_v1.1.0-dev1.yaml  | 18 +++++++++---------
 ...derr-mediumcut.cwl => stderr-mediumcut.cwl} | 10 +---------
 ...stderr-shortcut.cwl => stderr-shortcut.cwl} |  9 +--------
 .../{egrep-stderr.cwl => stderr.cwl}           |  6 +-----
 8 files changed, 24 insertions(+), 62 deletions(-)
 rename v1.0/v1.0/{egrep-stderr-mediumcut.cwl => stderr-mediumcut.cwl} (66%)
 rename v1.0/v1.0/{egrep-stderr-shortcut.cwl => stderr-shortcut.cwl} (64%)
 rename v1.0/v1.0/{egrep-stderr.cwl => stderr.cwl} (71%)
 rename v1.1.0-dev1/v1.1.0-dev1/{egrep-stderr-mediumcut.cwl => stderr-mediumcut.cwl} (67%)
 rename v1.1.0-dev1/v1.1.0-dev1/{egrep-stderr-shortcut.cwl => stderr-shortcut.cwl} (65%)
 rename v1.1.0-dev1/v1.1.0-dev1/{egrep-stderr.cwl => stderr.cwl} (71%)

diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
index f9e234ed0..420f973f8 100644
--- a/v1.0/conformance_test_v1.0.yaml
+++ b/v1.0/conformance_test_v1.0.yaml
@@ -78,33 +78,33 @@
   doc: Test command execution in Docker with stdout redirection
 
 - job: v1.0/empty.json
-  tool: v1.0/egrep-stderr.cwl
+  tool: v1.0/stderr.cwl
   doc: Test command line with stderr redirection
   output:
     output_file:
       class: File
-      checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
-      size: 84
+      checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+      size: 4
       location: error.txt
 
 - job: v1.0/empty.json
-  tool: v1.0/egrep-stderr-shortcut.cwl
+  tool: v1.0/stderr-shortcut.cwl
   doc: Test command line with stderr redirection, brief syntax
   output:
     output_file:
       class: File
-      checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
-      size: 84
+      checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+      size: 4
       location: Any
 
 - output:
     output_file:
       class: File
-      size: 84
-      checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
+      size: 4
+      checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
       location: std.err
   job: v1.0/empty.json
-  tool: v1.0/egrep-stderr-mediumcut.cwl
+  tool: v1.0/stderr-mediumcut.cwl
   doc: Test command line with stderr redirection, named brief syntax
 
 - job: v1.0/cat-job.json
diff --git a/v1.0/v1.0/egrep-stderr-mediumcut.cwl b/v1.0/v1.0/stderr-mediumcut.cwl
similarity index 66%
rename from v1.0/v1.0/egrep-stderr-mediumcut.cwl
rename to v1.0/v1.0/stderr-mediumcut.cwl
index ca2732c6f..99bb72a0a 100644
--- a/v1.0/v1.0/egrep-stderr-mediumcut.cwl
+++ b/v1.0/v1.0/stderr-mediumcut.cwl
@@ -2,17 +2,9 @@
 class: CommandLineTool
 cwlVersion: v1.0
 doc: "Test of capturing stderr output in a docker container."
-hints:
-  DockerRequirement:
-    dockerPull: debian:wheezy
-
 inputs: []
-
 outputs:
   output_file:
     type: stderr
-
-baseCommand: egrep
-successCodes: [2]
-
+baseCommand: [sh, -c, "echo foo 1>&2"]
 stderr: std.err
diff --git a/v1.0/v1.0/egrep-stderr-shortcut.cwl b/v1.0/v1.0/stderr-shortcut.cwl
similarity index 64%
rename from v1.0/v1.0/egrep-stderr-shortcut.cwl
rename to v1.0/v1.0/stderr-shortcut.cwl
index b9088da54..1843ee3b7 100644
--- a/v1.0/v1.0/egrep-stderr-shortcut.cwl
+++ b/v1.0/v1.0/stderr-shortcut.cwl
@@ -2,15 +2,8 @@
 class: CommandLineTool
 cwlVersion: v1.0
 doc: "Test of capturing stderr output in a docker container."
-hints:
-  DockerRequirement:
-    dockerPull: debian:wheezy
-
 inputs: []
-
 outputs:
   output_file:
     type: stderr
-
-baseCommand: egrep
-successCodes: [2]
+baseCommand: [sh, -c, "echo foo 1>&2"]
diff --git a/v1.0/v1.0/egrep-stderr.cwl b/v1.0/v1.0/stderr.cwl
similarity index 71%
rename from v1.0/v1.0/egrep-stderr.cwl
rename to v1.0/v1.0/stderr.cwl
index d7a8814b9..7cb215fc1 100644
--- a/v1.0/v1.0/egrep-stderr.cwl
+++ b/v1.0/v1.0/stderr.cwl
@@ -2,14 +2,10 @@
 class: CommandLineTool
 cwlVersion: v1.0
 doc: "Test of capturing stderr output in a docker container."
-hints:
-  DockerRequirement:
-    dockerPull: debian:wheezy
 inputs: []
 outputs:
   output_file:
     type: File
     outputBinding: {glob: error.txt}
-baseCommand: egrep
-successCodes: [2]
+baseCommand: [sh, -c, "echo foo 1>&2"]
 stderr: error.txt
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 902cb2c63..ec8c2fe2e 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
@@ -78,33 +78,33 @@
   doc: Test command execution in Docker with stdout redirection
 
 - job: v1.1.0-dev1/empty.json
-  tool: v1.1.0-dev1/egrep-stderr.cwl
+  tool: v1.1.0-dev1/stderr.cwl
   doc: Test command line with stderr redirection
   output:
     output_file:
       class: File
-      checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
-      size: 84
+      checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+      size: 4
       location: error.txt
 
 - job: v1.1.0-dev1/empty.json
-  tool: v1.1.0-dev1/egrep-stderr-shortcut.cwl
+  tool: v1.1.0-dev1/stderr-shortcut.cwl
   doc: Test command line with stderr redirection, brief syntax
   output:
     output_file:
       class: File
-      checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
-      size: 84
+      checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+      size: 4
       location: Any
 
 - output:
     output_file:
       class: File
-      size: 84
-      checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
+      size: 4
+      checksum: sha1$f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
       location: std.err
   job: v1.1.0-dev1/empty.json
-  tool: v1.1.0-dev1/egrep-stderr-mediumcut.cwl
+  tool: v1.1.0-dev1/stderr-mediumcut.cwl
   doc: Test command line with stderr redirection, named brief syntax
 
 - job: v1.1.0-dev1/cat-job.json
diff --git a/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr-mediumcut.cwl b/v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl
similarity index 67%
rename from v1.1.0-dev1/v1.1.0-dev1/egrep-stderr-mediumcut.cwl
rename to v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl
index ef28494b0..89decd311 100644
--- a/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr-mediumcut.cwl
+++ b/v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl
@@ -2,17 +2,9 @@
 class: CommandLineTool
 cwlVersion: v1.1.0-dev1
 doc: "Test of capturing stderr output in a docker container."
-hints:
-  DockerRequirement:
-    dockerPull: debian:wheezy
-
 inputs: []
-
 outputs:
   output_file:
     type: stderr
-
-baseCommand: egrep
-successCodes: [2]
-
+baseCommand: [sh, -c, "echo foo 1>&2"]
 stderr: std.err
diff --git a/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr-shortcut.cwl b/v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl
similarity index 65%
rename from v1.1.0-dev1/v1.1.0-dev1/egrep-stderr-shortcut.cwl
rename to v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl
index 0908dff35..ef80085a5 100644
--- a/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr-shortcut.cwl
+++ b/v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl
@@ -2,15 +2,8 @@
 class: CommandLineTool
 cwlVersion: v1.1.0-dev1
 doc: "Test of capturing stderr output in a docker container."
-hints:
-  DockerRequirement:
-    dockerPull: debian:wheezy
-
 inputs: []
-
 outputs:
   output_file:
     type: stderr
-
-baseCommand: egrep
-successCodes: [2]
+baseCommand: [sh, -c, "echo foo 1>&2"]
diff --git a/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr.cwl b/v1.1.0-dev1/v1.1.0-dev1/stderr.cwl
similarity index 71%
rename from v1.1.0-dev1/v1.1.0-dev1/egrep-stderr.cwl
rename to v1.1.0-dev1/v1.1.0-dev1/stderr.cwl
index b1bbcfd0b..75137fcce 100644
--- a/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr.cwl
+++ b/v1.1.0-dev1/v1.1.0-dev1/stderr.cwl
@@ -2,14 +2,10 @@
 class: CommandLineTool
 cwlVersion: v1.1.0-dev1
 doc: "Test of capturing stderr output in a docker container."
-hints:
-  DockerRequirement:
-    dockerPull: debian:wheezy
 inputs: []
 outputs:
   output_file:
     type: File
     outputBinding: {glob: error.txt}
-baseCommand: egrep
-successCodes: [2]
+baseCommand: [sh, -c, "echo foo 1>&2"]
 stderr: error.txt