tools: update to sh version 2

The return value is now [a string by default][1]--unless one passes `_return_cmd=True` to opt-in to the old behaviour. Do so. [1]: https://github.com/amoffat/sh/blob/develop/MIGRATION.md#return-value-now-a-true-string Signed-off-by: FireFly <[email protected]>
seL4 · May 7, 2024 · aa47caa · aa47caa
1 parent e3df782
commit aa47caa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common.py b/common.py
@@ -66,7 +66,7 @@ def _init_build_directory(config, initialised, directory, tute_directory, output
         tute_dir = "-DTUTORIAL_DIR=" + os.path.basename(tute_directory)
         args = ['-G', 'Ninja'] + config_dict[config] + [tute_dir] + \
             ["-C", "../projects/sel4-tutorials/settings.cmake"]
-    return sh.cmake(args + [tute_directory], _cwd=directory, _out=output, _err=output)
+    return sh.cmake(args + [tute_directory], _cwd=directory, _out=output, _err=output, _return_cmd=True)
 
 
 def _init_tute_directory(config, tut, solution, task, directory, output=None):

diff --git a/test.py b/test.py
@@ -47,10 +47,10 @@ def run_single_test_iteration(build_dir, solution, logfile):
 
     check = sh.Command(os.path.join(build_dir, "check"))
     if solution:
-        result = check(_out=logfile, _cwd=build_dir)
+        result = check(_out=logfile, _cwd=build_dir, _return_cmd=True)
     else:
         # We check the start state if not solution
-        result = check("--start", _out=logfile, _cwd=build_dir)
+        result = check("--start", _out=logfile, _cwd=build_dir, _return_cmd=True)
     for proc in psutil.process_iter():
         if "qemu" in proc.name():
             proc.kill()