Updating tests

This commit is contained in:
retropikzel 2025-10-02 17:44:17 +03:00
parent 2e0b3c2e36
commit 172deb546c
2 changed files with 7 additions and 4 deletions

5
Jenkinsfile vendored
View File

@ -1,7 +1,7 @@
pipeline { pipeline {
agent { agent {
docker { docker {
image 'retropikzel1/compile-r7rs' image 'retropikzel1/snow-test'
label 'docker-x86_64' label 'docker-x86_64'
args '--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock' args '--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock'
} }
@ -24,8 +24,7 @@ pipeline {
if("${SCHEME}" == "chicken") { if("${SCHEME}" == "chicken") {
DOCKERIMG="chicken:5" DOCKERIMG="chicken:5"
} }
sh "docker run -v ${WORKSPACE}:/workdir -w /workdir schemers/${DOCKERIMG} sh -c \"make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes all install test\"" sh "snow-test ${SCHEME} test.scm"
archiveArtifacts artifacts: 'logs/*.log', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: true
} }
} }
} }

View File

@ -4,6 +4,7 @@ DOCKERIMG=${SCHEME}:head
VERSION=0.10.7 VERSION=0.10.7
CC=gcc CC=gcc
TMPDIR=.tmp TMPDIR=.tmp
PKGNAME=foreign-c-${VERSION}.tgz
ifeq "${SCHEME}" "chicken" ifeq "${SCHEME}" "chicken"
DOCKERIMG=${SCHEME}:5 DOCKERIMG=${SCHEME}:5
@ -38,7 +39,7 @@ install: package
uninstall: uninstall:
snow-chibi --impls=${SCHEME} remove "(foreign c)" snow-chibi --impls=${SCHEME} remove "(foreign c)"
test: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.a test-old: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.a
cp -r foreign ${TMPDIR}/test/ cp -r foreign ${TMPDIR}/test/
cp tests/*.scm ${TMPDIR}/test/ cp tests/*.scm ${TMPDIR}/test/
cp tests/c-include/libtest.h ${TMPDIR}/test/ cp tests/c-include/libtest.h ${TMPDIR}/test/
@ -47,6 +48,9 @@ test: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.
COMPILE_R7RS=${SCHEME} timeout 600 compile-r7rs -o test test.scm COMPILE_R7RS=${SCHEME} timeout 600 compile-r7rs -o test test.scm
cd ${TMPDIR}/test && printf "\n" | LD_LIBRARY_PATH=. timeout 600 ./test cd ${TMPDIR}/test && printf "\n" | LD_LIBRARY_PATH=. timeout 600 ./test
test: package
snow-test ${SCHEME} ${PKGNAME}
test-docker: test-docker:
docker run -it -v "${PWD}:/workdir" -w /workdir retropikzel1/compile-r7rs sh -c \ docker run -it -v "${PWD}:/workdir" -w /workdir retropikzel1/compile-r7rs sh -c \
"make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes install test" "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes install test"