Merge branch '9858-selenium-locking-port-binding'

[arvados.git] / sdk / cwl / arvados_cwl / runner.py

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index fbe587979ca46be32806e2db62661f3faff1609f..d7d5d2b32d620f96683294757e27d0f3396307f1 100644 (file)
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -8,7 +8,7 @@ import re
 import cwltool.draft2tool
 from cwltool.draft2tool import CommandLineTool
 import cwltool.workflow
-from cwltool.process import get_feature, scandeps, UnsupportedRequirement
+from cwltool.process import get_feature, scandeps, UnsupportedRequirement, normalizeFilesDirs
 from cwltool.load_tool import fetch_document
 from cwltool.pathmapper import adjustFileObjs, adjustDirObjs
 
@@ -74,6 +74,9 @@ class Runner(object):
         adjustDirObjs(sc, partial(visitFiles, workflowfiles))
         adjustDirObjs(self.job_order, partial(visitFiles, jobfiles))
 
+        normalizeFilesDirs(jobfiles)
+        normalizeFilesDirs(workflowfiles)
+
         keepprefix = kwargs.get("keepprefix", "")
         workflowmapper = ArvPathMapper(self.arvrunner, workflowfiles, "",
                                        keepprefix+"%s",