From 69a377410f1f35c00ca954c49aa0833eda26273d Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Thu, 12 Feb 2026 16:06:52 +0200
Subject: [PATCH] Fix testing

---
 .gitignore  |  1 +
 Jenkinsfile |  8 ++------
 Makefile    | 14 +++++++-------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a6fdccf..a8596b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ foreign
 venv
 tmp
 run-test*
+Akku.*
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 32a4e1e..37c4322 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,6 +28,7 @@ pipeline {
                                 stage("${SCHEME}") {
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                         sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r6rs run-test-docker"
+                                        archiveArtifacts(artifacts: '*.json', allowEmptyArchive: true, fingerprint: true)
                                     }
                                 }
                             }
@@ -46,6 +47,7 @@ pipeline {
                                 stage("${SCHEME}") {
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                         sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} RNRS=r7rs run-test-docker"
+                                        archiveArtifacts(artifacts: '*.json', allowEmptyArchive: true, fingerprint: true)
                                     }
                                 }
                             }
@@ -55,10 +57,4 @@ pipeline {
             }
         }
     }
-
-    post {
-        success {
-            archiveArtifacts(artifacts: '*.json', allowEmptyArchive: true, fingerprint: true)
-        }
-    }
 }
diff --git a/Makefile b/Makefile
index d2e76e7..01cd47e 100644
--- a/Makefile
+++ b/Makefile
@@ -59,18 +59,18 @@ run-test-system: build
 	echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (retropikzel mouth) (srfi 64) (retropikzel ctrf) (retropikzel ${LIBRARY}))" > run-test.scm
 	echo "(test-runner-current (ctrf-runner))" >> run-test.scm
 	cat ${TESTFILE} >> run-test.scm
-	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --always-yes srfi.64; fi
-	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install retropikzel.mouth; fi
-	if [ "${RNRS}" = "r7rs" ]; then printf "1\n1\n" | snow-chibi install retropikzel.ctrf; fi
+	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} --always-yes srfi.64; fi
+	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} --always-yes retropikzel.mouth; fi
+	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} --always-yes retropikzel.ctrf; fi
 	if [ "${SCHEME}" = "chezscheme" ]; then akku install akku-r7rs chez-srfi; fi
 	if [ "${SCHEME}" = "ikarus" ]; then akku install akku-r7rs chez-srfi; fi
 	if [ "${SCHEME}" = "ironscheme" ]; then akku install akku-r7rs chez-srfi; fi
 	if [ "${SCHEME}" = "racket" ]; then akku install akku-r7rs chez-srfi; fi
 	if [ "${RNRS}" = "r6rs" ]; then akku install; fi
-	if [ "${SCHEME}-${RNRS}" = "mosh-r7rs" ]; then snow-chibi install --always-yes srfi.64; fi
-	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install ${PKG}; fi
-	if [ "${RNRS}" = "r6rs" ]; then COMPILE_SCHEME=${SCHEME} compile-scheme run-test.sps; fi
-	if [ "${RNRS}" = "r7rs" ]; then COMPILE_SCHEME=${SCHEME} CSC_OPTIONS="-L -lcurl" compile-scheme run-test.scm; fi
+	if [ "${RNRS}" = "r7rs" ]; then snow-chibi install --impls=${SCHEME} ${PKG}; fi
+	rm -rf run-test
+	if [ "${RNRS}" = "r6rs" ]; then COMPILE_R7RS=${SCHEME} compile-scheme -I .akku/lib run-test.sps; fi
+	if [ "${RNRS}" = "r7rs" ]; then COMPILE_R7RS=${SCHEME} CSC_OPTIONS="-L -lcurl" compile-scheme run-test.scm; fi
 	./run-test
 
 run-test-docker: