Fixing testing

This commit is contained in:
retropikzel 2026-01-26 17:57:12 +02:00
parent 66302b5a90
commit 4bea79ba4a
6 changed files with 35 additions and 14 deletions

6
Jenkinsfile vendored
View File

@ -29,7 +29,8 @@ pipeline {
params.R6RS_SCHEMES.split().each { SCHEME -> params.R6RS_SCHEMES.split().each { SCHEME ->
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh "make SCHEME=${SCHEME} test-r6rs-docker | grep 'scheme-venv-test-success-Hello' || exit 1" sh "make SCHEME=${SCHEME} test-r6rs-script-docker | grep 'scheme-venv-script-test-success-Hello' || exit 1"
sh "make SCHEME=${SCHEME} test-r6rs-compile-docker | grep 'scheme-venv-compile-test-success-Hello' || exit 1"
} }
} }
} }
@ -42,7 +43,8 @@ pipeline {
params.R7RS_SCHEMES.split().each { SCHEME -> params.R7RS_SCHEMES.split().each { SCHEME ->
stage("${SCHEME}") { stage("${SCHEME}") {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh "make SCHEME=${SCHEME} test-r7rs-docker | grep 'scheme-venv-test-success' || exit 1" sh "make SCHEME=${SCHEME} test-r7rs-script-docker | grep 'scheme-venv-script-test-success' || exit 1"
sh "make SCHEME=${SCHEME} test-r7rs-compile-docker | grep 'scheme-venv-compile-test-success' || exit 1"
} }
} }
} }

View File

@ -6,22 +6,35 @@ all: build
build: build:
@echo "No build step, just install" @echo "No build step, just install"
test-r6rs: test-r6rs-script:
@echo "Starting test Scheme: ${SCHEME}, RNRS: R6RS"
@rm -rf testvenv/ \
&& ./scheme-venv ${SCHEME} r6rs testvenv \
&& ./testvenv/bin/snow-chibi install --always-yes retropikzel.hello \
&& ./testvenv/bin/akku install akku-r7rs \
&& SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-script test.sps
test-r6rs-compile:
@echo "Starting test Scheme: ${SCHEME}, RNRS: R6RS" @echo "Starting test Scheme: ${SCHEME}, RNRS: R6RS"
@rm -rf testvenv/ \ @rm -rf testvenv/ \
&& ./scheme-venv ${SCHEME} r6rs testvenv \ && ./scheme-venv ${SCHEME} r6rs testvenv \
&& ./testvenv/bin/snow-chibi install --always-yes retropikzel.hello \ && ./testvenv/bin/snow-chibi install --always-yes retropikzel.hello \
&& ./testvenv/bin/akku install akku-r7rs \ && ./testvenv/bin/akku install akku-r7rs \
&& SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-script test.sps \
&& SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-compile compile-test.sps \ && SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-compile compile-test.sps \
&& ./compile-test && ./compile-test
test-r7rs: test-r7rs-script:
@echo "Starting test Scheme: ${SCHEME}, RNRS: R7RS"
@rm -rf testvenv/ \
&& ./scheme-venv ${SCHEME} r7rs testvenv \
&& ./testvenv/bin/snow-chibi install --always-yes retropikzel.hello srfi.64 \
&& SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-script test.scm
test-r7rs-compile:
@echo "Starting test Scheme: ${SCHEME}, RNRS: R7RS" @echo "Starting test Scheme: ${SCHEME}, RNRS: R7RS"
@rm -rf testvenv/ \ @rm -rf testvenv/ \
&& ./scheme-venv ${SCHEME} r7rs testvenv \ && ./scheme-venv ${SCHEME} r7rs testvenv \
&& ./testvenv/bin/snow-chibi install --always-yes retropikzel.hello srfi.64 \ && ./testvenv/bin/snow-chibi install --always-yes retropikzel.hello srfi.64 \
&& SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-script test.scm \
&& SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-compile compile-test.scm \ && SCHEME_VENV_DEBUG=1 ./testvenv/bin/scheme-compile compile-test.scm \
&& ./compile-test && ./compile-test
@ -32,11 +45,17 @@ build-test-docker-image:
docker build --build-arg IMG=${SCHEME}:head -f Dockerfile.test --tag=scheme-venv-test-${SCHEME} . ; \ docker build --build-arg IMG=${SCHEME}:head -f Dockerfile.test --tag=scheme-venv-test-${SCHEME} . ; \
fi fi
test-r6rs-docker: build-test-docker-image test-r6rs-script-docker: build-test-docker-image
@docker run scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} test-r6rs" @docker run scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} test-r6rs-script"
test-r7rs-docker: build-test-docker-image test-r6rs-compile-docker: build-test-docker-image
@docker run scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} test-r7rs" @docker run scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} test-r6rs-compile"
test-r7rs-script-docker: build-test-docker-image
@docker run scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} test-r7rs-script"
test-r7rs-compile-docker: build-test-docker-image
@docker run scheme-venv-test-${SCHEME} bash -c "make SCHEME=${SCHEME} test-r7rs-compile"
install: install:
@mkdir -p ${PREFIX}/bin @mkdir -p ${PREFIX}/bin

View File

@ -4,6 +4,6 @@
(retropikzel hello) (retropikzel hello)
(srfi 64)) (srfi 64))
(display "scheme-venv-test-success-") (display "scheme-venv-compile-test-success-")
(hello) (hello)
(exit 0) (exit 0)

View File

@ -4,6 +4,6 @@
(retropikzel hello) (retropikzel hello)
(srfi :64)) (srfi :64))
(display "scheme-venv-test-success-") (display "scheme-venv-compile-test-success-")
(hello) (hello)
(exit 0) (exit 0)

View File

@ -4,6 +4,6 @@
(retropikzel hello) (retropikzel hello)
(srfi 64)) (srfi 64))
(display "scheme-venv-test-success-") (display "scheme-venv-script-test-success-")
(hello) (hello)
(exit 0) (exit 0)

View File

@ -4,6 +4,6 @@
(retropikzel hello) (retropikzel hello)
(srfi :64)) (srfi :64))
(display "scheme-venv-test-success-") (display "scheme-venv-script-test-success-")
(hello) (hello)
(exit 0) (exit 0)