niar/cmdrunner.py

@@ -5,7 +5,7 @@ import subprocess
 
 from .logging import logger
 
-__all__ = ["CompilationUnit", "CommandRunner", "CommandFailedError"]
+__all__ = ["CompilationUnit", "CommandRunner"]
 
 
 class CompilationUnit:
@@ -76,8 +76,6 @@ class CompilationUnit:
                 with open(inf, "rb") as f:
                     r[str(inf)] = f.read()
         return r
-
-
 class CommandRunner:
     cus: list[CompilationUnit]
 
@@ -123,16 +121,14 @@ class CommandRunner:
 
         failed = []
         for cu, proc in runnables:
-            if proc is not None:
+            if proc is not None and proc.wait() != 0:
-                status = proc.wait()
+                failed.append(cu)
-                if status != 0:
-                    failed.append((cu, status))
 
         if failed:
             logger.error("the following process(es) failed:")
-            for (cu, status) in failed:
+            for cu in failed:
-                logger.error(f"  {formatted(cu)} (status={status})")
+                logger.error(f"  {formatted(cu)}")
-            raise CommandFailedError(f"failed {step} step")
+            raise RuntimeError(f"failed {step} step")
 
         for cu, _ in runnables:
             cu.mark_up_to_date()
@@ -148,10 +144,6 @@ class CommandRunner:
         logger.info(f"{action} {formatted(cu)}")
 
 
-class CommandFailedError(RuntimeError):
-    pass
-
-
 def formatted(cu):
     if inspect.isfunction(cu.cmd):
         return cu.cmd.__name__

niar/cxxrtl.py

@@ -12,7 +12,7 @@ from amaranth._toolchain.yosys import find_yosys
 from amaranth.back import rtlil
 
 from .build import construct_top
-from .cmdrunner import CommandRunner, CommandFailedError
+from .cmdrunner import CommandRunner
 from .logging import logtime, logger
 from .project import Project
 
@@ -251,11 +251,7 @@ def main(np: Project, args):
                 infs=cc_o_paths + list(np.path("cxxrtl").glob("**/*.zig")),
                 outf=outf,
                 chdir="cxxrtl")
-            try:
+            cr.run()
-                cr.run()
-            except CommandFailedError:
-                logger.log(logging.INFO, "aborting on CommandFailedError")
-                return
             shutil.copy(outf, exe_o_path)
         else:
             cmd = [
@@ -270,11 +266,7 @@ def main(np: Project, args):
             cr.add_process(cmd,
                 infs=cc_o_paths,
                 outf=exe_o_path)
-            try:
+            cr.run()
-                cr.run()
-            except CommandFailedError:
-                logger.log(logging.INFO, "aborting on CommandFailedError")
-                return
 
     if not args.compile:
         cmd = [exe_o_path]
@@ -286,8 +278,6 @@ def main(np: Project, args):
             except KeyboardInterrupt:
                 print(file=sys.stderr)
                 logger.log(logging.INFO, "aborting on KeyboardInterrupt")
-            except CommandFailedError:
-                logger.log(logging.INFO, "aborting on CommandFailedError")
 
 
 def _make_yosys_relative(path):