From 701eb7420319448c835d2e4d1db11e82b354fcf2 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 15 Mar 2025 07:06:54 +0200 Subject: [PATCH] Making room for more tests --- .gitignore | 1 + Makefile | 18 +++++++++--------- test.scm => tests/compliance.scm | 0 3 files changed, 10 insertions(+), 9 deletions(-) rename test.scm => tests/compliance.scm (100%) diff --git a/.gitignore b/.gitignore index da9d247..33b5b42 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ dockerfiles/build .scheme_testrunner core testfile.test +tests/compliance diff --git a/Makefile b/Makefile index e1287ec..d113f41 100644 --- a/Makefile +++ b/Makefile @@ -48,24 +48,24 @@ libtest.so: src/libtest.c libtest.a: libtest.o src/libtest.c ar rcs libtest.a libtest.o -test-script: libtest.so - SCHEME=${SCHEME} script-r7rs -I . test.scm +test-interpreter-compliance: libtest.so + SCHEME=${SCHEME} script-r7rs -I . tests/compliance.scm -test-script-docker: +test-interpreter-compliance-docker: 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} script-r7rs -I . test.scm" + docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && SCHEME=${SCHEME} script-r7rs -I . tests/compliance.scm" test-compile-library: libtest.so libtest.a libtest.o SCHEME=${SCHEME} compile-r7rs-library retropikzel/pffi.sld -test-compile: test-compile-library - SCHEME=${SCHEME} CFLAGS="-I./include -L." LDFLAGS="-ltest libtest.o" compile-r7rs -I . test.scm - ./test +test-compiler-compliance: test-compile-library + SCHEME=${SCHEME} CFLAGS="-I./include -L." LDFLAGS="-ltest libtest.o" compile-r7rs -I . tests/compliance.scm + ./tests/compliance -test-compile-docker: libtest.so libtest.a +test-compiler-compliance-docker: libtest.so libtest.a 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 && SCHEME=${SCHEME} compile-r7rs -I . test.scm && ./test" + docker run -v ${PWD}:/workdir pffi-${SCHEME} bash -c "cd /workdir && SCHEME=${SCHEME} compile-r7rs -I . compliance.scm && ./test" clean: @rm -rf retropikzel/pffi/*.o* diff --git a/test.scm b/tests/compliance.scm similarity index 100% rename from test.scm rename to tests/compliance.scm