Add test to ensure that arguments containing shell directives are not interpreted and that shellQuote: false has no effect when ShellCommandRequirement is not in effect.

Peter Amstutz · Peter Amstutz · commit 4573403163f5 · 2017-03-03T10:43:52.000-05:00
diff --git a/v1.0/conformance_test_v1.0.yaml b/v1.0/conformance_test_v1.0.yaml
@@ -981,3 +981,21 @@
       size: 15
   tool: v1.0/imported-hint.cwl
   doc: Test hints with $import
+
+- job: v1.0/empty.json
+  output: {
+    "stderr_file": {
+        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "location": Any,
+        "class": "File",
+        "size": 0
+    },
+    "stdout_file": {
+        "checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
+        "location": Any,
+        "class": "File",
+        "size": 9
+    }
+  }
+  tool: v1.0/shellchar.cwl
+  doc: "Test that shell directives are not interpreted."
diff --git a/v1.0/v1.0/shellchar.cwl b/v1.0/v1.0/shellchar.cwl
@@ -0,0 +1,13 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.0
+doc: |
+  Ensure that arguments containing shell directives are not interpreted and
+  that `shellQuote: false` has no effect when ShellCommandRequirement is not in
+  effect.
+inputs: []
+outputs:
+  stdout_file: stdout
+  stderr_file: stderr
+baseCommand: echo
+arguments: [{valueFrom: "foo 1>&2", shellQuote: false}]
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
@@ -992,3 +992,21 @@
       size: 15
   tool: v1.1.0-dev1/imported-hint.cwl
   doc: Test hints with $import
+
+- job: v1.1.0-dev1/empty.json
+  output: {
+    "stderr_file": {
+        "checksum": "sha1$da39a3ee5e6b4b0d3255bfef95601890afd80709",
+        "location": Any,
+        "class": "File",
+        "size": 0
+    },
+    "stdout_file": {
+        "checksum": "sha1$1555252d52d4ec3262538a4426a83a99cfff4402",
+        "location": Any,
+        "class": "File",
+        "size": 9
+    }
+  }
+  tool: v1.1.0-dev1/shellchar.cwl
+  doc: "Test that shell directives are not interpreted."
diff --git a/v1.1.0-dev1/v1.1.0-dev1/shellchar.cwl b/v1.1.0-dev1/v1.1.0-dev1/shellchar.cwl
@@ -0,0 +1,13 @@
+#!/usr/bin/env cwl-runner
+class: CommandLineTool
+cwlVersion: v1.1.0-dev1
+doc: |
+  Ensure that arguments containing shell directives are not interpreted and
+  that `shellQuote: false` has no effect when ShellCommandRequirement is not in
+  effect.
+inputs: []
+outputs:
+  stdout_file: stdout
+  stderr_file: stderr
+baseCommand: echo
+arguments: [{valueFrom: "foo 1>&2", shellQuote: false}]
