From: William D. Jones <thor0505@comcast.net>
Date: Sun, 14 Jul 2019 17:28:19 +0000 (-0400)
Subject: build.run: Ensure batch script returns proper error code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d0d86eed32031cceb5d11a61c4f7ea1c4b11a1a;p=nmigen.git

build.run: Ensure batch script returns proper error code.
---

diff --git a/nmigen/build/run.py b/nmigen/build/run.py
index 31d04c8..14409c9 100644
--- a/nmigen/build/run.py
+++ b/nmigen/build/run.py
@@ -71,7 +71,13 @@ class BuildPlan:
 
             if run_script:
                 if sys.platform.startswith("win32"):
-                    subprocess.check_call(["cmd", "/c", "{}.bat".format(self.script)])
+                    # Without "call", "cmd /c {}.bat" will return 0.
+                    # See https://stackoverflow.com/a/30736987 for a detailed
+                    # explanation of why, including disassembly/decompilation
+                    # of relevant code in cmd.exe.
+                    # Running the script manually from a command prompt is
+                    # unaffected- i.e. "call" is not required.
+                    subprocess.check_call(["cmd", "/c", "call {}.bat".format(self.script)])
                 else:
                     subprocess.check_call(["sh", "{}.sh".format(self.script)])