Pflarr/fix autoexit

bin/pav-lib.bash

@@ -4,7 +4,7 @@ PAV_PATH=$(dirname "${BASH_SOURCE[0]}")/pav
 # Echo the first argument, then return false
 function err() {
     echo $1
-    return 1
+    exit 1
 }
 
 # Find the module command to use. It's printed to stdout, nothing is printed if

lib/pavilion/test_run/test_run.py

@@ -1225,9 +1225,10 @@ def _write_script(self, stype: str, path: Path, config: dict, module_wrappers: d
         script.command(f'echo "(pav) Executing {stype} commands."')
         script.newline()
         cmds = config.get('cmds', [])
+        autoexit = utils.str_bool(self.config.get(stype, {}).get('autoexit'))
         if cmds:
             script.comment("Perform the sequence of test commands.")
-            if utils.str_bool(self.config.get(stype, {}).get('autoexit')):
+            if autoexit:
                 script.command("set -e -o pipefail")
             for line in config.get('cmds', []):
                 if line is None:
@@ -1237,7 +1238,13 @@ def _write_script(self, stype: str, path: Path, config: dict, module_wrappers: d
         else:
             script.comment('No commands given for this script.')
 
+        # When autoexit isn't set, we need to preserve the return value of the last script command.
+        if not autoexit:
+            script.command("PAV_EXIT=$?")
         script.command(f'echo "(pav) Test {stype} commands completed without error."')
+        if not autoexit:
+            script.command("exit $PAV_EXIT")
+
 
         script.write(path)
 

test/tests/autoexit_tests.py

@@ -23,3 +23,13 @@ def test_autoexit(self):
         test = self._quick_test(cfg=cfg_run_no)
         testreturn = test.run()
         self.assertEqual(testreturn, 0)
+
+        # Make sure we actually catch the case where the final return is false.
+        cfg_run_no = self._quick_test_cfg()
+        cfg_run_no['run'] = {'cmds': ['false', 'echo "did not exit"', 'false'], 'autoexit': 'False'}
+        test = self._quick_test(cfg=cfg_run_no)
+        testreturn = test.run()
+        self.assertEqual(testreturn, 1)
+        with open(test.path/'run.log') as file:
+            self.assertIn("did not exit", file.read())
+