Move to test-r7rs

Dockerfile.test

@@ -1,30 +0,0 @@
-ARG SCHEME=chibi
-FROM docker.io/schemers/${SCHEME}
-ARG SCHEME=chibi
-ENV COMPILE_R7RS=${SCHEME}
-
-RUN apt-get update && apt-get install -y \
-    build-essential libffi-dev libcurl4-openssl-dev curl guile-3.0 \
-    git ca-certificates
-
-COPY --from=schemers/loko:head /usr/local /usr/loko
-RUN cp -r /usr/loko/* /usr/local/
-COPY --from=schemers/chibi:head /usr/local /usr/chibi
-RUN cp -r /usr/chibi/lib/* /usr/local/lib/
-RUN cp -r /usr/chibi/share/* /usr/local/share/
-RUN cp -r /usr/chibi/bin/*chibi* /usr/local/bin/
-RUN ldconfig
-
-ADD https://codeberg.org/retropikzel/compile-r7rs/raw/branch/main/compile-r7rs .
-RUN install compile-r7rs /usr/local/bin/compile-r7rs
-
-RUN mkdir -p /root/.snow && echo "()" > /root/.snow/config.scm
-
-WORKDIR /workdir
-ARG SCHEME=chibi
-ENV COMPILE_R7RS=${SCHEME}
-COPY test-headers.sps .
-COPY test-headers.scm .
-COPY Makefile .
-COPY retropikzel retropikzel/
-

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)
                                     }
                                 }

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