Use ShellCommandRequirement for stderr tests.

kapilkd13 · Mar 3, 2017 · e6dc6e4 · e6dc6e4
1 parent 7098e43
commit e6dc6e4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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