From 900d1966611ad97e096238a62b6d2ceb33f4679d Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sat, 29 Nov 2025 09:20:28 +0200
Subject: [PATCH] Improving testing

---
 .gitignore  | 12 ++++++++++++
 Dockerfile  |  7 ++++---
 Jenkinsfile |  4 ++--
 Makefile    |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e624cad..90f3799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,16 @@
 .*
 Akku.lock
 Akku.manifest
+foreign
+*.log
+*.a
+*.o
+*.so
+*.c
+*.import.scm
+*.link
+test-r6rs.sps
+test-r6rs
+test-r7rs.scm
+test-r7rs
 
diff --git a/Dockerfile b/Dockerfile
index 58f1400..01d2545 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,12 +10,13 @@ RUN wget https://gitlab.com/-/project/6808260/uploads/094ce726ce3c6cf8c14560f1e3
     && mv akku-1.1.0.amd64-linux akku
 RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
 RUN git clone https://codeberg.org/retropikzel/compile-scheme.git --depth=1
-RUN git clone https://codeberg.org/foreign-c/foreign-c.git --depth=1
 WORKDIR /build/chibi-scheme
 RUN make
 RUN make install
 WORKDIR /build/compile-scheme
 RUN make build-gauche
+WORKDIR /build
+RUN git clone https://codeberg.org/foreign-c/foreign-c.git --depth=2
 
 ARG SCHEME=chibi
 ARG IMAGE=${SCHEME}:head
@@ -35,8 +36,8 @@ RUN bash install.sh
 ENV PATH=/root/.local/bin:${PATH}
 RUN akku update
 WORKDIR /build/foreign-c
-RUN timeout 60 snow-chibi install --impls=${SCHEME} --always-yes "(srfi 64)"
-RUN timeout 60 snow-chibi install --impls=${SCHEME} --always-yes "(foreign c)"
+RUN if [ ! "${SCHEME}" = "racket" ]; then timeout 30 snow-chibi install --impls=${SCHEME} --always-yes "(srfi 64)"; fi
+RUN if [ ! "${SCHEME}" = "larceny" ]; then timeout 30 snow-chibi install --impls=${SCHEME} --always-yes "(foreign c)"; fi
 RUN make SCHEME=${SCHEME} build install
 WORKDIR /workdir
 RUN cp -r /build/foreign-c/foreign .
diff --git a/Jenkinsfile b/Jenkinsfile
index d1c2e7e..7571f2a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
                                     def IMG="${SCHEME}:head"
                                     stage("${SCHEME} - ${LIBRARY}") {k
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker"
+                                            sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker"
                                         }
                                     }
                                 }
@@ -54,7 +54,7 @@ pipeline {
                                     }
                                     stage("${SCHEME} - ${LIBRARY}") {
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "timeout 6000 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
+                                            sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
                                         }
                                     }
                                 }
diff --git a/Makefile b/Makefile
index f2945a3..eff14da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 .SILENT: build install test test-docker clean
+.PHONY: test-r6rs test-r7rs
 SCHEME=chibi
 LIBRARY=system
 AUTHOR=Retropikzel