From cce660e2d56c15b47300596a8c698d8afc636504 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Thu, 11 Dec 2025 18:24:50 +0200
Subject: [PATCH] Fix testing

---
 Jenkinsfile          | 4 ++--
 Makefile             | 3 ++-
 retropikzel/ctrf.scm | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 53d92bb..cc75196 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
                                 [(SCHEME): {
                                     stage("${SCHEME}") {
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "timeout 600 make SCHEME=${SCHEME} DOCKER_QUIET="" test-r6rs-docker"
+                                            sh "make SCHEME=${SCHEME} DOCKER_QUIET="" test-r6rs-docker"
                                         }
                                     }
                                 }]
@@ -48,7 +48,7 @@ pipeline {
                                 [(SCHEME): {
                                     stage("${SCHEME}") {
                                         catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                            sh "timeout 600 make SCHEME=${SCHEME} DOCKER_QUIET="" test-r7rs-docker"
+                                            sh "make SCHEME=${SCHEME} DOCKER_QUIET="" test-r7rs-docker"
                                         }
                                     }
                                 }]
diff --git a/Makefile b/Makefile
index e12aa6b..5aca643 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ test-r6rs: ${TMPDIR}
 test-r6rs-docker: ${TMPDIR}
 	echo "Building docker image..."
 	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null
-	ocker stop $$(docker ps -a -q --filter ancestor=${DOCKE_TAG} --format="{{.ID}}")
+	docker stop $$(docker ps -a -q --filter ancestor=${DOCKER_TAG} --format="{{.ID}}") 2>&1 > /dev/null || true
 	docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs"
 
 test-r7rs: ${TMPDIR}
@@ -65,6 +65,7 @@ test-r7rs: ${TMPDIR}
 test-r7rs-docker: ${TMPDIR}
 	echo "Building docker image..."
 	docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null
+	docker stop $$(docker ps -a -q --filter ancestor=${DOCKER_TAG} --format="{{.ID}}") 2>&1 > /dev/null || true
 	docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs"
 
 clean:
diff --git a/retropikzel/ctrf.scm b/retropikzel/ctrf.scm
index dfd8b18..fcc53b6 100644
--- a/retropikzel/ctrf.scm
+++ b/retropikzel/ctrf.scm
@@ -112,5 +112,6 @@
               (lambda ()
                 (json-write output (current-output-port))))
             (json-write failed-tests (current-output-port))
+            (newline)
             (exit (+ fail xfail)))))
       runner)))