Upgrading tests

This commit is contained in:
retropikzel 2025-09-27 15:30:32 +03:00
parent f3b8afad4f
commit bd9c6c455c
2 changed files with 12 additions and 13 deletions

2
Jenkinsfile vendored
View File

@ -22,7 +22,7 @@ pipeline {
} }
steps { steps {
script { script {
def schemes = "chibi chicken gauche guile kawa mosh racket sagittarius stklos ypsilon" def schemes = "chicken gauche guile kawa racket sagittarius stklos ypsilon"
schemes.split().each { SCHEME -> schemes.split().each { SCHEME ->
stage("${SCHEME}") { stage("${SCHEME}") {

View File

@ -2,7 +2,7 @@
SCHEME=chibi SCHEME=chibi
VERSION=0.10.7 VERSION=0.10.7
CC=gcc CC=gcc
TMPDIR=.tmp/ TMPDIR=.tmp
all: package all: package
@ -41,32 +41,31 @@ test-old: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libt
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: test: ${TMPDIR}/test ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest.a
rm -rf ${TMPDIR} cp -r foreign ${TMPDIR}/test/
mkdir -p ${TMPDIR} cp test.scm ${TMPDIR}/test/
cp test.scm ${TMPDIR}/ cd ${TMPDIR}/test && COMPILE_R7RS="${SCHEME}" test-r7rs ${TEST_R7RS_ARGS} --use-docker-head -I . -o test test.scm
cp -r foreign ${TMPDIR}/
cd ${TMPDIR} && COMPILE_R7RS="${SCHEME}" test-r7rs ${TEST_R7RS_ARGS} --use-docker-head -I . -o test test.scm
test-docker: test-docker:
docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-test-${SCHEME} -f Dockerfile.test . docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=foreign-c-test-${SCHEME} -f Dockerfile.test .
docker run -it -v "${PWD}:/workdir" -w /workdir -t foreign-c-test-${SCHEME} sh -c \ docker run -it -v "${PWD}:/workdir" -w /workdir -t foreign-c-test-${SCHEME} sh -c \
"timeout 120 make SCHEME=${SCHEME} TEST=${TEST} SNOW_CHIBI_ARGS=--always-yes install test" "timeout 120 make SCHEME=${SCHEME} TEST=${TEST} SNOW_CHIBI_ARGS=--always-yes install test"
${TMPDIR}/test/libtest.o: tests/c-src/libtest.c ${TMPDIR}/test/libtest.o: tests/c-src/libtest.c ${TMPDIR}/test
mkdir -p ${TMPDIR}/test
${CC} ${CFLAGS} -o ${TMPDIR}/test/libtest.o -fPIC -c tests/c-src/libtest.c -I./include ${LDFLAGS} ${CC} ${CFLAGS} -o ${TMPDIR}/test/libtest.o -fPIC -c tests/c-src/libtest.c -I./include ${LDFLAGS}
${TMPDIR}/test/libtest.so: tests/c-src/libtest.c ${TMPDIR}/test/libtest.so: tests/c-src/libtest.c ${TMPDIR}/test
mkdir -p ${TMPDIR}/test
${CC} ${CFLAGS} -o ${TMPDIR}/test/libtest.so -shared -fPIC tests/c-src/libtest.c -I./include ${LDFLAGS} ${CC} ${CFLAGS} -o ${TMPDIR}/test/libtest.so -shared -fPIC tests/c-src/libtest.c -I./include ${LDFLAGS}
${TMPDIR}/test/libtest.a: ${TMPDIR}/test/libtest.o tests/c-src/libtest.c ${TMPDIR}/test/libtest.a: ${TMPDIR}/test/libtest.o tests/c-src/libtest.c ${TMPDIR}/test
ar rcs ${TMPDIR}/test/libtest.a ${TMPDIR}/test/libtest.o ${LDFLAGS} ar rcs ${TMPDIR}/test/libtest.a ${TMPDIR}/test/libtest.o ${LDFLAGS}
${TMPDIR}: ${TMPDIR}:
mkdir -p ${TMPDIR} mkdir -p ${TMPDIR}
${TMPDIR}/test: ${TMPDIR}
mkdir -p ${TMPDIR}/test
chibi: foreign/c/primitives/chibi/foreign-c.stub chibi: foreign/c/primitives/chibi/foreign-c.stub
chibi-ffi foreign/c/primitives/chibi/foreign-c.stub chibi-ffi foreign/c/primitives/chibi/foreign-c.stub
${CC} \ ${CC} \