Retropikzel
/
scheme-libraries
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix testing

This commit is contained in:
retropikzel 2025-12-11 18:08:12 +02:00
parent 7a3eb8dea7
commit 658838081a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -28,7 +28,7 @@ pipeline {
[(SCHEME): { [(SCHEME): {
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { 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): { [(SCHEME): {
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { 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"
} }
} }
}] }]

6
Makefile
View File

@ -21,6 +21,8 @@ ifeq "${SCHEME}" "chicken"
DOCKERIMG="chicken:5" DOCKERIMG="chicken:5"
endif endif
DOCKER_QUIET="--quiet"
all: build all: build
build: retropikzel/${LIBRARY}/LICENSE retropikzel/${LIBRARY}/VERSION retropikzel/${LIBRARY}/README.md build: retropikzel/${LIBRARY}/LICENSE retropikzel/${LIBRARY}/VERSION retropikzel/${LIBRARY}/README.md
@ -49,7 +51,7 @@ test-r6rs: ${TMPDIR}
test-r6rs-docker: ${TMPDIR} test-r6rs-docker: ${TMPDIR}
echo "Building docker image..." 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} \ docker run -t scheme-library-test-${SCHEME} \
sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs" 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} test-r7rs-docker: ${TMPDIR}
echo "Building docker image..." 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} \ docker run -t scheme-library-test-${SCHEME} \
sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs" sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs"