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:24:50 +02:00
parent 1d4ceddbb5
commit cce660e2d5
3 changed files with 5 additions and 3 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} DOCKER_QUIET="" test-r6rs-docker" sh "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} DOCKER_QUIET="" test-r7rs-docker" sh "make SCHEME=${SCHEME} DOCKER_QUIET="" test-r7rs-docker"
} }
} }
}] }]

3
Makefile
View File

@ -53,7 +53,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=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null 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" docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs"
test-r7rs: ${TMPDIR} test-r7rs: ${TMPDIR}
@ -65,6 +65,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=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null 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" docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs"
clean: clean:

1
retropikzel/ctrf.scm
View File

@ -112,5 +112,6 @@
(lambda () (lambda ()
(json-write output (current-output-port)))) (json-write output (current-output-port))))
(json-write failed-tests (current-output-port)) (json-write failed-tests (current-output-port))
(newline)
(exit (+ fail xfail))))) (exit (+ fail xfail)))))
runner))) runner)))