From 22e2ee3da3e3279c24855416bd20bc6b52455b12 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Wed, 25 Mar 2026 14:19:23 +0200
Subject: [PATCH] Move to test-r7rs

---
 Jenkinsfile |  4 ++--
 Makefile    | 18 ++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a48b07..f24fc12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ pipeline {
                                 stage("${SCHEME}") {
                                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                         sh "rm -rf logs/*.json"
-                                        sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r6rs test-docker"
+                                        sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r6rs test"
                                         archiveArtifacts(artifacts: "logs/${SCHEME}-${LIBRARY}.ctrf.json", allowEmptyArchive: false, fingerprint: true)
                                     }
                                 }
@@ -48,7 +48,7 @@ pipeline {
                                 stage("${SCHEME}") {
                                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                         sh "rm -rf logs/*.json"
-                                        sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r7rs test-docker"
+                                        sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r7rs test"
                                         archiveArtifacts(artifacts: "logs/${SCHEME}-${LIBRARY}.ctrf.json", allowEmptyArchive: false, fingerprint: true)
                                     }
                                 }
diff --git a/Makefile b/Makefile
index d06937d..ebd2a48 100644
--- a/Makefile
+++ b/Makefile
@@ -30,21 +30,15 @@ install:
 	snow-chibi install --impls=${SCHEME} --always-yes ${PKG}
 
 test: logs build
-	mkdir -p logs
 	rm -rf .tmp
 	mkdir -p .tmp
+	cp ${PKG} .tmp/
 	cat test-headers.${SFX} ${TESTFILE} | sed 's/LIBRARY/${LIBRARY}/' > .tmp/test.${SFX}
-	cd .tmp && ${SNOW} srfi.64
-	cd .tmp && ${SNOW} retropikzel.mouth
-	cd .tmp && ${SNOW} ../${PKG}
-	cd .tmp && akku install akku-r7rs 2> /dev/null
-	cd .tmp && COMPILE_R7RS=${SCHEME} CSC_OPTIONS="-L -lcurl" compile-r7rs ${LIB_PATHS} -o test test.${SFX};
-	cd .tmp && ./test
-	mv .tmp/*.json logs/ || true
-
-test-docker: logs
-	docker build --build-arg IMAGE=${IMAGE} --build-arg SCHEME=${SCHEME} -f Dockerfile.test --tag=${SCHEME}-testing .
-	docker run -v "${PWD}/logs:/workdir/logs" -w /workdir ${SCHEME}-testing sh -c "make SCHEME=${SCHEME} RNRS=${RNRS} LIBRARY=${LIBRARY} test"
+	cd .tmp && SNOW_PACKAGES="srfi.64 retropikzel.mouth" \
+		APT_PACKAGES="libcurl4-openssl-dev" \
+		COMPILE_R7RS=${SCHEME} \
+		CSC_OPIONS="-L -lcurl" \
+		test-r7rs test.${SFX} ${PKG}
 
 retropikzel/wasm/plus.wasm: retropikzel/wasm/plus.c
 	emcc -o retropikzel/wasm/plus.js retropikzel/wasm/plus.c