From f5063a5bee7325891174d48467793302d44117d9 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Wed, 1 Oct 2025 23:26:37 +0300
Subject: [PATCH] Updating tests

---
 Dockerfile.test | 34 +++++++++++++++-------------------
 Makefile        |  4 ++++
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 17a7514..c12c2da 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,26 +1,22 @@
 ARG SCHEME=chibi
-ARG IMAGE=chibi:head
-FROM schemers/${IMAGE}
-FROM debian:trixie AS build
-WORKDIR /cache/debs
-RUN apt-get update && apt-get install \
-    -y \
-    --no-install-recommends \
-    --no-install-suggests \
-    --download-only \
-    gcc libffi-dev libc-dev make linux-libc-dev
-RUN cp -r /var/cache/apt/archives/*.deb .
+ARG IMAGE=${SCHEME}:head
+FROM debian:trixie-slim AS cache
+RUN apt-get update && apt-get install -y make gcc git
+WORKDIR /cache
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
+RUN cd chibi-scheme && make
 
 ARG SCHEME=chibi
-ARG IMAGE=chibi:head
+ARG IMAGE=${SCHEME}:head
 FROM schemers/${IMAGE}
-RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
-COPY --from=build /cache /cache
-WORKDIR /cache/debs
-RUN dpkg -i *.deb
+RUN apt-get update && apt-get install -y make gcc libffi-dev
 COPY --from=retropikzel1/compile-r7rs /opt/compile-r7rs /opt/compile-r7rs
-ENV PATH=/opt/compile-r7rs/bin:${PATH}
-WORKDIR /
-ARG SCHEME=chibi
+COPY --from=cache /cache /cache
+WORKDIR /cache/chibi-scheme
+RUN make -j8 install
+WORKDIR /workdir
 ENV COMPILE_R7RS=${SCHEME}
+ENV PATH=/opt/compile-r7rs/bin:${PATH}
+ARG SCHEME=chibi
+RUN snow-chibi install --always-yes --impls=${SCHEME} "(srfi 64)"
 
diff --git a/Makefile b/Makefile
index 07e2bf9..689061c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,10 @@ VERSION=0.10.7
 CC=gcc
 TMPDIR=.tmp
 
+ifeq "${SCHEME}" "chicken"
+DOCKERIMG=${SCHEME}:5
+endif
+
 all: package
 
 package: README.html