From c22a7005e7d2f05af27e560aaf5927004de2f003 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Thu, 11 Dec 2025 21:23:08 +0200
Subject: [PATCH] Fix testing

---
 Dockerfile.test | 13 +++++++------
 Makefile        |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 657d2de..a99856e 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -8,7 +8,8 @@ WORKDIR /build
 RUN wget https://gitlab.com/-/project/6808260/uploads/094ce726ce3c6cf8c14560f1e31aaea0/akku-1.1.0.amd64-linux.tar.xz \
     && tar -xf akku-1.1.0.amd64-linux.tar.xz \
     && mv akku-1.1.0.amd64-linux akku
-RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=2
+#RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=2
+RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch=snow-chibi-kawa-fixes --depth=1
 RUN git clone https://codeberg.org/retropikzel/compile-scheme.git --depth=2
 RUN git clone https://github.com/srfi-explorations/r7rs-srfi.git --branch=retropikzel-fixes --depth=4
 WORKDIR /build/chibi-scheme
@@ -38,11 +39,11 @@ RUN bash install.sh
 ENV PATH=/root/.local/bin:${PATH}
 RUN akku update
 WORKDIR /build/r7rs-srfi
-RUN make SCHEME=${SCHEME} SRFI=60 SNOW_FORT_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=39 SNOW_FORT_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=64 SNOW_FORT_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=145 SNOW_FORT_ARGS=--always-yes build install
-RUN make SCHEME=${SCHEME} SRFI=180 SNOW_FORT_ARGS=--always-yes build install
+RUN make SCHEME=${SCHEME} SRFI=60 SNOW_CHIBI_ARGS=--always-yes build install
+RUN make SCHEME=${SCHEME} SRFI=39 SNOW_CHIBI_ARGS=--always-yes build install
+RUN make SCHEME=${SCHEME} SRFI=64 SNOW_CHIBI_ARGS=--always-yes build install
+RUN make SCHEME=${SCHEME} SRFI=145 SNOW_CHIBI_ARGS=--always-yes build install
+RUN make SCHEME=${SCHEME} SRFI=180 SNOW_CHIBI_ARGS=--always-yes build install
 WORKDIR /workdir
 COPY Makefile .
 COPY retropikzel retropikzel/
diff --git a/Makefile b/Makefile
index dc36283..07c483e 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ test-r7rs: ${TMPDIR}
 test-r7rs-docker: ${TMPDIR}
 	echo "Building docker image..."
 	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null
-	docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs"
+	docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} build install test-r7rs"
 
 clean:
 	git clean -X -f