stderr redirect tests use "echo" instead of checking for the usage me…

…ssage of "egrep".
kapilkd13 · Mar 2, 2017 · 8ab5eb9 · 8ab5eb9
1 parent d0fc2df
commit 8ab5eb9
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 62 deletions.
diff --git 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 → v1.0/v1.0/stderr-mediumcut.cwl b/v1.0/v1.0/egrep-stderr-mediumcut.cwl → 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 → v1.0/v1.0/stderr-shortcut.cwl b/v1.0/v1.0/egrep-stderr-shortcut.cwl → 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 → v1.0/v1.0/stderr.cwl b/v1.0/v1.0/egrep-stderr.cwl → 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
@@ -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/v1.1.0-dev1/egrep-stderr-mediumcut.cwl → v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl b/...v1/v1.1.0-dev1/egrep-stderr-mediumcut.cwl → 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/...ev1/v1.1.0-dev1/egrep-stderr-shortcut.cwl → v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl b/...ev1/v1.1.0-dev1/egrep-stderr-shortcut.cwl → 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 → v1.1.0-dev1/v1.1.0-dev1/stderr.cwl b/v1.1.0-dev1/v1.1.0-dev1/egrep-stderr.cwl → 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