Merge branch 'master' into fix-648

Author: mr-c

cwltool/sandboxjs.py

@@ -292,7 +292,8 @@ def stdfmt(data):  # type: (Text) -> Text
         info = u"returncode was: %s\nscript was:\n%s\nstdout was: %s\nstderr was: %s\n" %\
                (nodejs.returncode, fn_linenum(), stdfmt(stdoutdata.decode('utf-8')), stdfmt(stderrdata.decode('utf-8')))
     else:
-        info = stdfmt(stderrdata.decode('utf-8'))
+        info = u"Javascript expression was: %s\nstdout was: %s\nstderr was: %s" %\
+               (js, stdfmt(stdoutdata.decode('utf-8')), stdfmt(stderrdata.decode('utf-8')))
 
     if nodejs.poll() not in (None, 0):
         if killed: