riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[test] fixed the bugs in unicode failures. Refer to ttps://github.com/davidbombal/red-python-scripts/issues/4

This commit is contained in:
tangxifan 2024-11-13 12:27:33 -08:00
parent 5c8b7c565c
commit 9e6f9759d7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openfpga_flow/scripts/run_fpga_flow.py
View File

@ -1017,17 +1017,17 @@ def run_command(taskname, logfile, command, exit_if_fail=True):
try: try:
output.write(" ".join(command) + "\n") output.write(" ".join(command) + "\n")
process = subprocess.run( process = subprocess.run(
command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=False
) )
output.write(process.stdout) output.write(process.stdout.decode("cp1252"))
output.write(process.stderr) output.write(process.stderr.decode("cp1252"))
output.write(str(process.returncode)) output.write(str(process.returncode))
if "openfpgashell" in logfile: if "openfpgashell" in logfile:
filter_openfpga_output(process.stdout) filter_openfpga_output(process.stdout.decode("cp1252"))
if process.returncode: if process.returncode:
logger.error("%s run failed with returncode %d" % (taskname, process.returncode)) logger.error("%s run failed with returncode %d" % (taskname, process.returncode))
logger.error("command %s" % " ".join(command)) logger.error("command %s" % " ".join(command))
filter_failed_process_output(process.stderr) filter_failed_process_output(process.stderr.decode("cp1252"))
if exit_if_fail: if exit_if_fail:
clean_up_and_exit("Failed to run %s task" % taskname) clean_up_and_exit("Failed to run %s task" % taskname)
except Exception: except Exception:
@ -1036,7 +1036,7 @@ def run_command(taskname, logfile, command, exit_if_fail=True):
if exit_if_fail: if exit_if_fail:
clean_up_and_exit("Failed to run %s task" % taskname) clean_up_and_exit("Failed to run %s task" % taskname)
logger.info("%s is written in file %s" % (taskname, logfile)) logger.info("%s is written in file %s" % (taskname, logfile))
return process.stdout return process.stdout.decode("cp1252")
def filter_openfpga_output(vpr_output): def filter_openfpga_output(vpr_output):