From a6ceb4cf17b7b272863172967b6fb9b91aa89923 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sat, 13 Sep 2025 11:52:26 +0300
Subject: [PATCH] Fixing tests

---
 dockerfiles/Dockerfile.test => Dockerfile.test |  0
 Jenkinsfile                                    |  9 +--------
 Makefile                                       |  2 +-
 dockerfiles/Dockerfile.snow-chibi-install-test | 18 ------------------
 4 files changed, 2 insertions(+), 27 deletions(-)
 rename dockerfiles/Dockerfile.test => Dockerfile.test (100%)
 delete mode 100644 dockerfiles/Dockerfile.snow-chibi-install-test

diff --git a/dockerfiles/Dockerfile.test b/Dockerfile.test
similarity index 100%
rename from dockerfiles/Dockerfile.test
rename to Dockerfile.test
diff --git a/Jenkinsfile b/Jenkinsfile
index 8875131..e74957e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,13 +11,6 @@ pipeline {
     }
 
     stages {
-        stage('Package') {
-            steps {
-                sh "docker build --build-arg IMAGE=chibi:head --build-arg SCHEME=chibi --tag=foreign-c-test-chibi -f dockerfiles/Dockerfile.test ."
-                sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-chibi sh -c \"timeout 120 make clean all\""
-            }
-        }
-
         stage('Tests') {
             steps {
                 script {
@@ -45,7 +38,7 @@ pipeline {
                                             } else {
                                                 DOCKERIMG="${implementation}:head"
                                             }
-                                            sh "docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${implementation} --tag=foreign-c-test-${implementation} -f dockerfiles/Dockerfile.test ."
+                                            sh "docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${implementation} --tag=foreign-c-test-${implementation} -f Dockerfile.test ."
                                                 sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make SCHEME=${implementation} TEST=${test} clean test\""
                                         }
                                     }
diff --git a/Makefile b/Makefile
index 045a098..c4a868d 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ test: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.
 	cd ${TMPDIR}/test \ && timeout 60 printf "\n" | LD_LIBRARY_PATH=. ./${TEST}
 
 test-docker:
-	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-test-${SCHEME} -f dockerfiles/Dockerfile.test .
+	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-test-${SCHEME} -f Dockerfile.test .
 	docker run -it -v "${PWD}:/workdir" -w /workdir -t foreign-c-test-${SCHEME} sh -c "make SCHEME=${SCHEME} TEST=${TEST} SNOW_CHIBI_ARGS=--always-yes install test"
 
 ${TMPDIR}/test/libtest.o: tests/c-src/libtest.c
diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
deleted file mode 100644
index 6c436d1..0000000
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ /dev/null
@@ -1,18 +0,0 @@
-ARG SCHEME=chibi
-ARG IMAGE=chibi:head
-FROM schemers/${IMAGE}
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    git \
-    make \
-    libffi-dev \
-    pandoc \
-    tree
-RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
-COPY --from=retropikzel1/compile-r7rs /opt/compile-r7rs /opt/compile-r7rs
-ENV PATH=/opt/compile-r7rs/bin:${PATH}
-ARG SCHEME=chibi
-ENV COMPILE_R7RS=${SCHEME}
-ENV GUILE_AUTO_COMPILE=0
-RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-RUN cd chibi-scheme && make && make install