From 5ab4e904dabe23e0591a1a926538201df6cd2025 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sun, 25 Jan 2026 10:24:53 +0200
Subject: [PATCH] Fixing testing

---
 Dockerfile.test | 19 ++++++++++++++-----
 Jenkinsfile     |  2 +-
 Makefile        |  8 ++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 8a8c0a1..925c6b9 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,12 +1,14 @@
 ARG SCHEME=chibi
 FROM docker.io/debian:trixie AS build
 RUN apt-get update && apt-get install -y \
-    build-essential chezscheme git ca-certificates wget
+    build-essential git ca-certificates wget libncurses-dev libx11-dev
 WORKDIR /build
-RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-WORKDIR /build/chibi-scheme
-RUN make PREFIX=/root/.local
-RUN make PREFIX=/root/.local install
+RUN wget https://github.com/cisco/ChezScheme/releases/download/v10.3.0/csv10.3.0.tar.gz && tar -xf csv10.3.0.tar.gz
+WORKDIR /build/csv10.3.0
+RUN ./configure --prefix=/root/local
+RUN make
+RUN make install
+RUN apt-get install -y guile-3.0
 WORKDIR /build
 RUN wget https://gitlab.com/-/project/6808260/uploads/9d23bb6ec47dd2d7ee41802115cd7d80/akku-1.1.0.src.tar.xz && tar -xf akku-1.1.0.src.tar.xz
 WORKDIR /build/akku-1.1.0.src
@@ -14,14 +16,21 @@ RUN ./install.sh
 WORKDIR /build
 RUN wget https://ftp.gnu.org/gnu/make/make-4.4.tar.gz && tar -xf make-4.4.tar.gz
 WORKDIR /build/make-4.4
+ENV PATH=/root/.local:${PATH}
 RUN ./configure --prefix=/root/.local
 RUN make
 run make install
+WORKDIR /build
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
+WORKDIR /build/chibi-scheme
+RUN make PREFIX=/root/.local
+RUN make PREFIX=/root/.local install
 
 ARG SCHEME=chibi
 FROM docker.io/schemers/${SCHEME}:head
 COPY --from=build /root/.local /root/.local
 ENV PATH=/root/.local/bin:${PATH}
+ENV LD_LIBRARY_PATH=/root/.local/lib
 WORKDIR /workdir
 COPY Makefile Makefile
 COPY test.scm test.scm
diff --git a/Jenkinsfile b/Jenkinsfile
index 80d24bf..417d1a2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
     parameters {
         string(name: 'R6RS_SCHEMES', defaultValue: 'chezscheme', description: '')
-        string(name: 'R7RS_SCHEMES', defaultValue: 'chibi', description: '')
+        string(name: 'R7RS_SCHEMES', defaultValue: 'chibi gauche', description: '')
     }
 
     stages {
diff --git a/Makefile b/Makefile
index 9969078..1845702 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,17 @@ build:
 	@echo "No build step, just install"
 
 test:
-	rm -rf testvenv/ && ./scheme-venv ${SCHEME} ${RNRS} testvenv && ./testvenv/bin/snow-chibi install retropikzel.hello && ./testvenv/bin/scheme-script test.scm
+	rm -rf testvenv/ \
+		&& ./scheme-venv ${SCHEME} ${RNRS} testvenv \
+		&& ./testvenv/bin/snow-chibi install retropikzel.hello \
+		&& ./testvenv/bin/akku install akku-r7rs \
+		&& ./testvenv/bin/scheme-script test.scm
 
 build-docker-test-image:
 	docker build --build-arg SCHEME=${SCHEME} -f Dockerfile.test --tag=scheme-venv-test .
 
 test-docker: build-docker-test-image
-	docker run -it -t scheme-venv-test bash -c "make SCHEME=${SCHEME} RNRS=${RNRS} test"
+	docker run -t scheme-venv-test bash -c "make SCHEME=${SCHEME} RNRS=${RNRS} test"
 
 install:
 	mkdir -p ${PREFIX}/bin