1 files changed, 8 insertions, 7 deletions
diff --git a/tests/drivers/actor_image_test.py b/tests/drivers/actor_image_test.py
index 9df8828..5b815f2 100644
--- a/tests/drivers/actor_image_test.py
+++ b/tests/drivers/actor_image_test.py
@@ -1,12 +1,16 @@
 #!/usr/bin/env python3
 # source syntax callbacks execute in the host while actor code is emitted separately.
 from pathlib import Path
+import sys
 import argparse
 import subprocess
 import tempfile
+sys.dont_write_bytecode = True  # importing imagekit must not leave __pycache__ in the tree
+from imagekit import micro_image
 
 parser = argparse.ArgumentParser()
-parser.add_argument('--host', default='bin/zy')
+parser.add_argument('--host', default='build/bin/zy')
+parser.add_argument('--mkgenome', default='build/bin/mkgenome')
 parser.add_argument('--case', default='')
 args = parser.parse_args()
 prefix = b''.join(Path(f).read_bytes() + b'\n' for f in ('src/runtime/rt.zc', 'src/core/core.zc', 'src/runtime/run.zc'))
@@ -18,11 +22,8 @@ for name, source, expected in cases:
         directory = Path(work)
         compiled = subprocess.run([args.host], input=Path('src/tools/build.zc').read_bytes() + b'`' + prefix + source.encode(), capture_output=True, timeout=30)
         assert compiled.returncode == 0 and len(compiled.stdout) >= 56 and not compiled.stdout.startswith(b'zc:'), (name, compiled.stdout[:2000], compiled.stderr)
-        header = subprocess.run(['bin/mkgenome'], input=compiled.stdout, capture_output=True, check=True)
-        (directory / 'genome.h').write_bytes(header.stdout)
-        for f in ('src/core/memmap.h', 'src/core/fops.h', 'src/core/bops.h', 'src/core/stack.h', 'src/micro/micro.c', 'src/micro/micro_port.h', 'src/micro/port_linux.c'):
-            (directory / Path(f).name).write_bytes(Path(f).read_bytes())
-        subprocess.run(['cc', '-O2', '-w', '-fwrapv', '-pthread', '-DZY_THREADS', str(directory / 'micro.c'), str(directory / 'port_linux.c'), '-I' + work, '-o', str(directory / 'image')], check=True, timeout=30)
-        result = subprocess.run([str(directory / 'image')], capture_output=True, timeout=12)
+        image = subprocess.run([args.mkgenome], input=compiled.stdout, capture_output=True, check=True)
+        binary = micro_image(directory, image.stdout)
+        result = subprocess.run([str(binary)], capture_output=True, timeout=12)
         assert result.returncode == 0 and result.stdout == expected, (name, result.returncode, result.stdout, result.stderr)
         print('ok   actor compiler-free image: ' + name)