mirrors/sby
3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-04-06 14:24:08 +00:00
Code Activity

Make SbyProc hide Windows differences in retcode handling

Browse source 
Without this, we don't properly detect missing solver binaries and do
not properly handle the return status of the pono solver.
This commit is contained in:
Jannis Harder 2022-07-06 11:19:51 +02:00
parent ff1f87e169
commit b3b315a473
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sbysrc/sby_core.py
View file

@ -176,7 +176,7 @@ class SbyProc:
fcntl.fcntl(self.p.stdout, fcntl.F_SETFL, fl | os.O_NONBLOCK) fcntl.fcntl(self.p.stdout, fcntl.F_SETFL, fl | os.O_NONBLOCK)
else: else:
self.p = subprocess.Popen(self.cmdline, shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, self.p = subprocess.Popen(self.cmdline + " & exit !errorlevel!", shell=True, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
stderr=(subprocess.STDOUT if self.logstderr else None)) stderr=(subprocess.STDOUT if self.logstderr else None))
self.task.update_proc_running(self) self.task.update_proc_running(self)
@ -200,23 +200,31 @@ class SbyProc:
self.running = False self.running = False
self.exited = True self.exited = True
if self.p.returncode == 127: if os.name == "nt":
if self.p.returncode == 9009:
returncode = 127
else:
returncode = self.p.returncode & 0xff
else:
returncode = self.p.returncode
if returncode == 127:
if not self.silent: if not self.silent:
self.task.log(f"{self.info}: COMMAND NOT FOUND. ERROR.") self.task.log(f"{self.info}: COMMAND NOT FOUND. ERROR.")
self.handle_error(self.p.returncode) self.handle_error(returncode)
self.terminated = True self.terminated = True
self.task.proc_failed(self) self.task.proc_failed(self)
return return
if self.checkretcode and self.p.returncode not in self.retcodes: if self.checkretcode and returncode not in self.retcodes:
if not self.silent: if not self.silent:
self.task.log(f"{self.info}: task failed. ERROR.") self.task.log(f"{self.info}: task failed. ERROR.")
self.handle_error(self.p.returncode) self.handle_error(returncode)
self.terminated = True self.terminated = True
self.task.proc_failed(self) self.task.proc_failed(self)
return return
self.handle_exit(self.p.returncode) self.handle_exit(returncode)
self.finished = True self.finished = True
for next_proc in self.notify: for next_proc in self.notify: