aboutsummaryrefslogtreecommitdiffhomepage
path: root/pyecsca/codegen
diff options
context:
space:
mode:
authorJ08nY2020-12-14 17:38:23 +0100
committerJ08nY2020-12-14 17:38:23 +0100
commitbf264e994bedf8c5df7f9477b9546271d1ddaf00 (patch)
tree406a6d631c02a7251ea866aff1caaea26ded47fe /pyecsca/codegen
parent467b3185e9d2ef3457ad3c1281280c87394ab912 (diff)
downloadpyecsca-codegen-bf264e994bedf8c5df7f9477b9546271d1ddaf00.tar.gz
pyecsca-codegen-bf264e994bedf8c5df7f9477b9546271d1ddaf00.tar.zst
pyecsca-codegen-bf264e994bedf8c5df7f9477b9546271d1ddaf00.zip
Fix tests with master version of pyecsca.
Diffstat (limited to 'pyecsca/codegen')
-rw-r--r--pyecsca/codegen/render.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pyecsca/codegen/render.py b/pyecsca/codegen/render.py
index c5c9367..2649073 100644
--- a/pyecsca/codegen/render.py
+++ b/pyecsca/codegen/render.py
@@ -4,7 +4,7 @@ import subprocess
import tempfile
from _ast import Pow
from os import path
-from os import mkdir
+from os import makedirs
from typing import Optional, List, Set, Mapping, MutableMapping, Any, Tuple
from jinja2 import Environment, PackageLoader
@@ -216,7 +216,7 @@ def render(config: DeviceConfiguration) -> Tuple[str, str, str]:
for sym in symlinks:
os.symlink(resource_filename("pyecsca.codegen", sym), path.join(temp, sym))
gen_dir = path.join(temp, "gen")
- os.mkdir(gen_dir)
+ makedirs(gen_dir, exist_ok=True)
save_render(temp, "Makefile",
render_makefile(config.platform, config.hash_type, config.mod_rand, config.red, config.mult, config.sqr))
@@ -253,10 +253,10 @@ def build(dir: str, elf_file: str, hex_file: str, outdir: str, strip: bool = Fal
if res.returncode != 0:
raise ValueError("Build failed!")
if strip:
- subprocess.run(["make", "strip"], cwd=dir)
+ subprocess.run(["make", "strip"], cwd=dir, capture_output=True)
full_elf_path = path.join(dir, elf_file)
full_hex_path = path.join(dir, hex_file)
- mkdir(outdir)
+ makedirs(outdir, exist_ok=True)
shutil.copy(full_elf_path, outdir)
shutil.copy(full_hex_path, outdir)
if remove: