From 658838081af55283fa97fa4a540428de5d4264e7 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 11 Dec 2025 18:08:12 +0200 Subject: [PATCH] Fix testing --- Jenkinsfile | 4 ++-- Makefile | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86f37f4..53d92bb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { [(SCHEME): { stage("${SCHEME}") { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "timeout 600 make SCHEME=${SCHEME} test-r6rs-docker" + sh "timeout 600 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} test-r7rs-docker" + sh "timeout 600 make SCHEME=${SCHEME} DOCKER_QUIET="" test-r7rs-docker" } } }] diff --git a/Makefile b/Makefile index 4e9e1e8..ddfc42b 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,8 @@ ifeq "${SCHEME}" "chicken" DOCKERIMG="chicken:5" endif +DOCKER_QUIET="--quiet" + all: build build: retropikzel/${LIBRARY}/LICENSE retropikzel/${LIBRARY}/VERSION retropikzel/${LIBRARY}/README.md @@ -49,7 +51,7 @@ test-r6rs: ${TMPDIR} test-r6rs-docker: ${TMPDIR} echo "Building docker image..." - docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=scheme-library-test-${SCHEME} -f Dockerfile.test --quiet . > /dev/null + docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=scheme-library-test-${SCHEME} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null docker run -t scheme-library-test-${SCHEME} \ sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs" @@ -61,7 +63,7 @@ test-r7rs: ${TMPDIR} test-r7rs-docker: ${TMPDIR} echo "Building docker image..." - docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=scheme-library-test-${SCHEME} -f Dockerfile.test --quiet . > /dev/null + docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=scheme-library-test-${SCHEME} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null docker run -t scheme-library-test-${SCHEME} \ sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs"