From c6ebec5eaee6c27cf0a8d8b50514524ecb953bf1 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Fri, 28 Feb 2025 13:11:48 +0200 Subject: [PATCH] Simplifying testing --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2cae58c..63b0cde 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,10 @@ -.PHONY=libtest.so +.PHONY=libtest.so libtest.a CC=gcc DOCKER=docker run -it -v ${PWD}:/workdir DOCKER_INIT=cd /workdir && make clean && +build: libstest.so libtest.a + jenkinsfile: gosh -r7 -I ./snow build.scm @@ -17,17 +19,17 @@ test-script: libtest.so SCHEME=${SCHEME} script-r7rs -I . test.scm test-script-docker: - sudo docker build -f dockerfiles/test . --build-arg SCHEME=${SCHEME} --tag=pffi-${SCHEME} - sudo docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && make libtest.so && SCHEME=${SCHEME} script-r7rs -I . test.scm" + docker build -f dockerfiles/test . --build-arg SCHEME=${SCHEME} --tag=pffi-${SCHEME} + docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && make libtest.so && SCHEME=${SCHEME} script-r7rs -I . test.scm" test-compile: libtest.so libtest.a SCHEME=${SCHEME} compile-r7rs-library retropikzel/pffi.sld SCHEME=${SCHEME} compile-r7rs -I . test.scm && ./test test-compile-docker: libtest.so libtest.a - sudo docker build -f dockerfiles/test . --build-arg SCHEME=${SCHEME} --tag=pffi-${SCHEME} - sudo docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && SCHEME=${SCHEME} compile-r7rs-library retropikzel/pffi.sld" - sudo docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && SCHEME=${SCHEME} compile-r7rs -I . test.scm && ./test" + docker build -f dockerfiles/test . --build-arg SCHEME=${SCHEME} --tag=pffi-${SCHEME} + docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && SCHEME=${SCHEME} compile-r7rs-library retropikzel/pffi.sld" + docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && make libtest.so libtest.a && SCHEME=${SCHEME} compile-r7rs -I . test.scm && ./test" CHIBI=chibi-scheme -A . test-chibi-docker: