Skip to content

Commit d7ae9f5

Browse files
author
Peter Amstutz
committed
Fix a couple of directory tests by adding loadListing
1 parent 6bcf406 commit d7ae9f5

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

Process.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,12 @@ $graph:
469469
Specify the desired behavior for loading the `listing` field of
470470
a Directory object for use by expressions.
471471
472+
The order of precedence for loadListing is:
473+
474+
1. `loadListing` on an individual parameter
475+
2. Inherited from `LoadListingRequirement`
476+
3. By default: `no_listing`
477+
472478
- name: FieldBase
473479
type: record
474480
extends: Labeled

tests/dir5.cwl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ requirements:
55
- class: InitialWorkDirRequirement
66
listing: $(inputs.indir.listing)
77
inputs:
8-
indir: Directory
8+
indir:
9+
type: Directory
10+
loadListing: shallow_listing
911
outputs:
1012
outlist:
1113
type: File
@@ -14,4 +16,4 @@ outputs:
1416
arguments: ["find", "-L", ".", "!", "-path", "*.txt",
1517
{shellQuote: false, valueFrom: "|"},
1618
"sort"]
17-
stdout: output.txt
19+
stdout: output.txt

tests/inpdir_update_wf.cwl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ steps:
3232
inputs:
3333
d1:
3434
type: Directory
35-
# inputBinding:
36-
# loadListing: shallow_listing
35+
loadListing: shallow_listing
3736
d2:
3837
type: Directory
39-
# inputBinding:
40-
# loadListing: shallow_listing
38+
loadListing: shallow_listing
4139
outputs:
4240
d1out: File[]
4341
d2out: File[]

0 commit comments

Comments
 (0)