From f6318bac3cb02712ce7eb650a0df72a24f981227 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 19 Jul 2025 20:34:23 +0300 Subject: [PATCH] Bring things to new compile-r7rs --- Jenkinsfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 798e08c..6d0eef5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { DOCKERIMG="${implementation}:head" } sh "docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${implementation} --tag=foreign-c-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ." - sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make clean all install-jenkins SCHEME=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && SCHEME=${implementation} timeout 120 compile-r7rs -o hello hello.scm && timeout 120 printf \"\\n\" | ./hello\"" + sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make SCHEME=${implementation} clean all install-jenkins && cp tests/hello.scm /tmp/ && cd /tmp && SCHEME=${implementation} timeout 120 compile-r7rs -o hello hello.scm && timeout 120 printf \"\\n\" | ./hello\"" } } tests.each { test -> diff --git a/Makefile b/Makefile index a9e0d1e..efbdff8 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ test: ${TMPDIR}/test/libtest.o ${TMPDIR}/test/libtest.so ${TMPDIR}/test/libtest. cp tests/*.scm ${TMPDIR}/test/ cp tests/c-include/libtest.h ${TMPDIR}/test/ cd ${TMPDIR}/test && \ - COMPILE_R7RS_CHICKEN="-L -ltest -I. -L." \ + COMPILE_R7RS_CHICKEN="-L -ltest -I. -L. -C -static" \ COMPILE_R7RS_KAWA="-J--add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED -J--enable-native-access=ALL-UNNAMED -J--enable-preview" \ COMPILE_R7RS=${SCHEME} \ compile-r7rs ${INCDIRS} -o ${TEST} ${TEST}.scm