Merge pull request #1316 from ESMCI/jgfouca/handle_titan_batch_errs

Better handling of poorly implemented batch systems

Test suite: by-hand, code-checker
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes #1270

User interface changes?: None

Code review: @rljacob @jedwards4b

scripts/lib/CIME/XML/env_batch.py

@@ -384,7 +384,7 @@ def submit_single_job(self, case, job, depid=None, no_batch=False, batch_args=No
                 submitcmd += string + " "
 
         logger.info("Submitting job script %s"%submitcmd)
-        output = run_cmd_no_fail(submitcmd)
+        output = run_cmd_no_fail(submitcmd + " 2>&1")
         jobid = self.get_job_id(output)
         logger.info("Submitted job id is %s"%jobid)
         return jobid

scripts/lib/CIME/utils.py

@@ -209,8 +209,12 @@ def run_cmd_no_fail(cmd, input_str=None, from_dir=None, verbose=None,
     'foo'
     """
     stat, output, errput = run_cmd(cmd, input_str, from_dir, verbose, arg_stdout, arg_stderr)
-    expect(stat == 0, "Command: '%s' failed with error '%s'%s" %
-           (cmd, errput, "" if from_dir is None else " from dir '%s'" % from_dir))
+    if stat != 0:
+        # If command produced no errput, put output in the exception since we
+        # have nothing else to go on.
+        errput = output if errput == "" else errput
+        expect(False, "Command: '%s' failed with error '%s'%s" %
+               (cmd, errput, "" if from_dir is None else " from dir '%s'" % from_dir))
     return output
 
 def check_minimum_python_version(major, minor):