From 7d352e9999bf608a94e75a874469accd962aa0c2 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sat, 6 Dec 2025 12:04:13 +0200
Subject: [PATCH] Improving tests

---
 Jenkinsfile | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6379bad..e251b78 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,36 +28,40 @@ pipeline {
         stage('Tests') {
             parallel {
                 stage('R6RS x86_64 Debian') {
-                    steps {
                         script {
                             params.LIBRARIES.split().each { LIBRARY ->
                                 stage("${LIBRARY}") {
-                                    params.R6RS_SCHEMES.split().each { SCHEME ->
-                                        def IMG="${SCHEME}:head"
-                                        stage("${SCHEME} - ${LIBRARY}") {
-                                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                                sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker"
+                                    stages {
+                                        params.R6RS_SCHEMES.split().each { SCHEME ->
+                                            def IMG="${SCHEME}:head"
+                                            stage("${SCHEME} - ${LIBRARY}") {
+                                                steps {
+                                                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                                        sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r6rs-docker"
+                                                    }
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
                         }
-                    }
                 }
                 stage('R7RS x86_64 Debian') {
                     steps {
                         script {
                             params.LIBRARIES.split().each { LIBRARY ->
                                 stage("${LIBRARY}") {
-                                    params.R7RS_SCHEMES.split().each { SCHEME ->
-                                        def IMG="${SCHEME}:head"
-                                        if("${SCHEME}" == "chicken") {
-                                            IMG="${SCHEME}:5"
-                                        }
-                                        stage("${SCHEME} - ${LIBRARY}") {
-                                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                                                sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
+                                    stages {
+                                        params.R7RS_SCHEMES.split().each { SCHEME ->
+                                            def IMG="${SCHEME}:head"
+                                            if("${SCHEME}" == "chicken") {
+                                                IMG="${SCHEME}:5"
+                                            }
+                                            stage("${SCHEME} - ${LIBRARY}") {
+                                                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                                    sh "timeout 600 make SCHEME=${SCHEME} LIBRARY=${LIBRARY} test-r7rs-docker"
+                                                }
                                             }
                                         }
                                     }