1 files changed, 11 insertions, 12 deletions
diff --git a/tests/drivers/seed_growth_test.py b/tests/drivers/seed_growth_test.py
index 426c970..b94445e 100644
--- a/tests/drivers/seed_growth_test.py
+++ b/tests/drivers/seed_growth_test.py
@@ -1,25 +1,24 @@
 #!/usr/bin/env python3
 # stage 0 accepts long source streams and grows a tiny initial image reservation.
+import sys
 import pathlib
 import subprocess
 import tempfile
+sys.dont_write_bytecode = True  # importing imagekit must not leave __pycache__ in the tree
+from imagekit import compiler, micro_image
 
 root = pathlib.Path(__file__).resolve().parents[2]
+(root / 'build').mkdir(exist_ok=True)
 with tempfile.TemporaryDirectory(prefix='seed-growth-', dir=root / 'build') as directory:
     folder = pathlib.Path(directory)
-    subprocess.run(['bin/genmap', '--preset', 'run', '--grow', '--genome', '600000', '--heap', '1048576', '-o', directory], check=True, capture_output=True)
-    compiler = folder / 'zc0'
-    subprocess.run(['cc', '-O1', '-w', '-fwrapv', '-DMAXW=16', 'src/tools/zc0.c', '-I' + directory, '-Isrc/core', '-o', str(compiler)], check=True)
+    subprocess.run(['build/bin/genmap', '--preset', 'run', '--grow', '--genome', '600000', '--heap', '1048576', '-o', directory], check=True, capture_output=True)
+    zc0 = folder / 'zc0'
+    subprocess.run([compiler(), '-O1', '-w', '-fwrapv', '-DMAXW=16', 'src/tools/zc0.c', '-I' + directory, '-Isrc/core', '-o', str(zc0)], check=True)
     source = '/*' + 'x' * (5 << 20) + '*/\n'
-    source += (folder / 'rt.zc').read_text() + (root / 'src/runtime/run.zc').read_text()
-    source += 'let data[550000]; fn main() { data[549999] = 7; put_n(data[549999]); put_c(32); put_n(4611686018427387904); put_c(10); return 0; }\n'
-    with (folder / 'genome.h').open('w') as output:
-        subprocess.run([str(compiler)], input=source, text=True, stdout=output, check=True, timeout=30)
-    binary = folder / 'vm'
-    import shutil
-    for path in ['src/micro/micro.c', 'src/micro/micro_port.h', 'src/micro/port_linux.c', 'src/core/fops.h', 'src/core/bops.h', 'src/core/stack.h']:
-        shutil.copy(root / path, folder)
-    subprocess.run(['cc', '-O2', '-w', '-fwrapv', str(folder / 'micro.c'), str(folder / 'port_linux.c'), '-I' + directory, '-o', str(binary)], check=True)
+    source += (folder / 'rt.zc').read_text() + (root / 'src/core/core.zc').read_text() + (root / 'src/runtime/run.zc').read_text()
+    source += 'namespace; include rt; let data[550000]; fn main() { data[549999] = 7; rt.put_n(data[549999]); rt.put_c(32); rt.put_n(4611686018427387904); rt.put_c(10); return 0; }\n'
+    image = subprocess.run([str(zc0)], input=source.encode(), capture_output=True, check=True, timeout=30).stdout
+    binary = micro_image(folder / 'vm', image, folder / 'memmap.h', threads=False) if (folder / 'vm').mkdir() is None else None
     result = subprocess.run([str(binary)], text=True, capture_output=True, timeout=20)
     assert result.returncode == 0 and result.stdout == '7 4611686018427387904\n', (result.returncode, result.stdout, result.stderr)
 print('ok   stage 0 reads beyond four megabytes and grows beyond its initial image capacity')