From e6dc6e4922c796ba44abe8c3d7f7ab621f2f3026 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 3 Mar 2017 10:22:13 -0500
Subject: [PATCH] Use ShellCommandRequirement for stderr tests.

---
 v1.0/v1.0/stderr-mediumcut.cwl               | 2 --
 v1.0/v1.0/stderr-shortcut.cwl                | 2 --
 v1.0/v1.0/stderr.cwl                         | 2 --
 v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl | 5 ++++-
 v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl  | 5 ++++-
 v1.1.0-dev1/v1.1.0-dev1/stderr.cwl           | 5 ++++-
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/v1.0/v1.0/stderr-mediumcut.cwl b/v1.0/v1.0/stderr-mediumcut.cwl
index 40ad55575..f04138efc 100644
--- a/v1.0/v1.0/stderr-mediumcut.cwl
+++ b/v1.0/v1.0/stderr-mediumcut.cwl
@@ -8,8 +8,6 @@ inputs: []
 outputs:
   output_file:
     type: stderr
-baseCommand: [sh]
 arguments:
- - '-c'
  - { valueFrom: "echo foo 1>&2", shellQuote: False }
 stderr: std.err
diff --git a/v1.0/v1.0/stderr-shortcut.cwl b/v1.0/v1.0/stderr-shortcut.cwl
index 30a1aae5f..df69badd3 100644
--- a/v1.0/v1.0/stderr-shortcut.cwl
+++ b/v1.0/v1.0/stderr-shortcut.cwl
@@ -8,7 +8,5 @@ inputs: []
 outputs:
   output_file:
     type: stderr
-baseCommand: [sh]
 arguments:
- - '-c'
  - { valueFrom: "echo foo 1>&2", shellQuote: False }
diff --git a/v1.0/v1.0/stderr.cwl b/v1.0/v1.0/stderr.cwl
index 7ca3019b7..1ec5f289b 100644
--- a/v1.0/v1.0/stderr.cwl
+++ b/v1.0/v1.0/stderr.cwl
@@ -9,8 +9,6 @@ outputs:
   output_file:
     type: File
     outputBinding: {glob: error.txt}
-baseCommand: [sh]
 arguments:
- - '-c'
  - { valueFrom: "echo foo 1>&2", shellQuote: False }
 stderr: error.txt
diff --git a/v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl b/v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl
index 89decd311..7d4cf2b43 100644
--- a/v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl
+++ b/v1.1.0-dev1/v1.1.0-dev1/stderr-mediumcut.cwl
@@ -2,9 +2,12 @@
 class: CommandLineTool
 cwlVersion: v1.1.0-dev1
 doc: "Test of capturing stderr output in a docker container."
+requirements:
+  ShellCommandRequirement: {}
 inputs: []
 outputs:
   output_file:
     type: stderr
-baseCommand: [sh, -c, "echo foo 1>&2"]
+arguments:
+ - { valueFrom: "echo foo 1>&2", shellQuote: False }
 stderr: std.err
diff --git a/v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl b/v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl
index ef80085a5..4d6cc5fdd 100644
--- a/v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl
+++ b/v1.1.0-dev1/v1.1.0-dev1/stderr-shortcut.cwl
@@ -2,8 +2,11 @@
 class: CommandLineTool
 cwlVersion: v1.1.0-dev1
 doc: "Test of capturing stderr output in a docker container."
+requirements:
+  ShellCommandRequirement: {}
 inputs: []
 outputs:
   output_file:
     type: stderr
-baseCommand: [sh, -c, "echo foo 1>&2"]
+arguments:
+ - { valueFrom: "echo foo 1>&2", shellQuote: False }
diff --git a/v1.1.0-dev1/v1.1.0-dev1/stderr.cwl b/v1.1.0-dev1/v1.1.0-dev1/stderr.cwl
index 75137fcce..74a6941c4 100644
--- a/v1.1.0-dev1/v1.1.0-dev1/stderr.cwl
+++ b/v1.1.0-dev1/v1.1.0-dev1/stderr.cwl
@@ -2,10 +2,13 @@
 class: CommandLineTool
 cwlVersion: v1.1.0-dev1
 doc: "Test of capturing stderr output in a docker container."
+requirements:
+  ShellCommandRequirement: {}
 inputs: []
 outputs:
   output_file:
     type: File
     outputBinding: {glob: error.txt}
-baseCommand: [sh, -c, "echo foo 1>&2"]
+arguments:
+ - { valueFrom: "echo foo 1>&2", shellQuote: False }
 stderr: error.txt