From bc2ac62ab8e8a3b5097f55d9a87c58e53608a75d Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Tue, 15 Jul 2025 08:11:58 +0300
Subject: [PATCH] Fixing tests

---
 Jenkinsfile | 2 +-
 Makefile    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 00b8119..6e593f9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
                     r7rs_implementations.each { implementation->
                         stage("${implementation} R7RS") {
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                sh "timeout 600 make test-r7rs-docker SCHEME=${implementation}"
+                                sh "make test-r7rs-docker SCHEME=${implementation}"
                             }
                         }
                     }
diff --git a/Makefile b/Makefile
index 85cb3d0..1e8b97f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ test-r6rs:
 	@grep "Test successfull" /tmp/compile-r7rs-test-result.txt || (echo "Test failed, output: " && cat /tmp/compile-r7rs-test-result.txt && exit 1)
 
 test-r6rs-docker:
-	docker build -f Dockerfile.test --build-arg COMPILE_R7RS=${SCHEME} --tag=compile-r7rs-test-${SCHEME} .
-	docker run -v "${PWD}":/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c "make && make install && make clean-test COMPILE_R7RS=${SCHEME} test-r6rs"
+	docker build -f Dockerfile.test --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} .
+	docker run -v "${PWD}":/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c "make && make install && make clean-test SCHEME=${SCHEME} test-r6rs"
 
 test-r7rs:
 	rm -rf /tmp/compile-r7rs-test-result.txt
@@ -55,8 +55,8 @@ test-r7rs:
 	@grep "Test successfull" /tmp/compile-r7rs-test-result.txt || (echo "Test failed, output: " && cat /tmp/compile-r7rs-test-result.txt && exit 1)
 
 test-r7rs-docker:
-	docker build -f Dockerfile.test --build-arg COMPILE_R7RS=${SCHEME} --tag=compile-r7rs-test-${SCHEME} .
-	docker run -v "${PWD}":/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c "make && make install && make clean-test COMPILE_R7RS=${SCHEME} test-r7rs"
+	docker build -f Dockerfile.test --build-arg SCHEME=${SCHEME} --tag=compile-r7rs-test-${SCHEME} .
+	docker run -v "${PWD}":/workdir -w /workdir -t compile-r7rs-test-${SCHEME} sh -c "make && make install && make clean-test SCHEME=${SCHEME} test-r7rs"
 
 clean-test:
 	rm -rf test