json_output_{path,location}_relative: remove need for ShellCommandRequirement

Author: mr-c

CommandLineTool.yml

@@ -170,6 +170,8 @@ $graph:
         `echo a && echo b`, and capture the output correctly.
       * `record_order_with_input_bindings`: Test sorting arguments at each level
         (`inputBinding` for all levels).
+      * `json_output_path_relative`: Test support for reading cwl.output.json
+        where 'path' is relative path in output dir.
 
       ### New Optional Conformance Tests for v1.2.1
 

conformance_tests.yaml

@@ -975,7 +975,7 @@
   id: json_output_path_relative
   doc: >-
     Test support for reading cwl.output.json where 'path' is relative path in output dir.
-  tags: [ shell_command, command_line_tool ]
+  tags: [ required, command_line_tool ]
 
 - job: tests/empty.json
   output: {
@@ -990,7 +990,7 @@
   id: json_output_location_relative
   doc: >-
     Test support for reading cwl.output.json where 'location' is relative reference to output dir.
-  tags: [ shell_command, command_line_tool ]
+  tags: [ required, command_line_tool ]
 
 - job: tests/abc.json
   output:

tests/test-cwl-out3.cwl

@@ -1,18 +1,20 @@
 class: CommandLineTool
 cwlVersion: v1.2
-requirements:
-  - class: ShellCommandRequirement
 hints:
   DockerRequirement:
     dockerPull: docker.io/debian:stable-slim
 
+baseCommand: sh
+
 inputs: []
 
 outputs:
   - id: foo
     type: File
 
+stdout: cwl.output.json
+
 arguments:
-   - valueFrom: >
-       echo foo > foo && echo '{"foo": {"path": "foo", "class": "File"} }' > cwl.output.json
-     shellQuote: false
+   - -c
+   - |
+     echo foo > foo && echo '{"foo": {"path": "foo", "class": "File"} }'

tests/test-cwl-out4.cwl

@@ -1,18 +1,23 @@
 class: CommandLineTool
 cwlVersion: v1.2
-requirements:
-  - class: ShellCommandRequirement
+
 hints:
   DockerRequirement:
     dockerPull: docker.io/debian:stable-slim
 
 inputs: []
 
+baseCommand: sh
+
+arguments:
+   - -c
+   - |
+     echo foo > foo && echo '{"foo": {"location": "foo", "class": "File"} }'
+
+stdout: cwl.output.json
+
 outputs:
   - id: foo
     type: File
 
-arguments:
-   - valueFrom: >
-       echo foo > foo && echo '{"foo": {"location": "foo", "class": "File"} }' > cwl.output.json
-     shellQuote: false
+