From 331fb7f13f6266cdb40861bb1b1c615a193aeb36 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sun, 20 Jul 2025 07:50:56 +0300 Subject: [PATCH] Making tests work --- Makefile | 4 ++-- README.md | 10 ++++++++-- dockerfiles/Dockerfile.snow-chibi-install-test | 3 ++- dockerfiles/Dockerfile.test | 3 ++- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c57ee90..1ee3e25 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY=libtest.o tests/libtest.so libtest.a documentation README.html +.PHONY: libtest.o tests/libtest.so libtest.a documentation README.html CC=gcc DOCKER=docker run -it -v ${PWD}:/workdir DOCKER_INIT=cd /workdir && make clean && @@ -22,7 +22,7 @@ build: README.html snow-chibi package \ --version=${VERSION} \ --authors="Retropikzel" \ - --doc=documentation/foreign-c.html \ + --doc=README.html \ --foreign-depends=ffi \ --description="Portable foreign function interface for R7RS Schemes" \ foreign/c.sld diff --git a/README.md b/README.md index 2313cd6..9c9b04f 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,7 @@ Required versions: ### Primitives 1 table + | | c-type-size | c-bytevector-u8-set! |c-bytevector-u8-ref | define-c-library | c-bytevector? | define-c-procedure | |------------------|:------------:|:--------------------:|:------------------:|:-------------------:|:-------------:|:-------------------:| | **Chibi** | X | X |X | X | X | X | @@ -122,8 +123,10 @@ Required versions: | **STklos** | X | X |X | X | X | X | | **Ypsilon** | X | X |X | X | X | X | + ### Primitives 2 table + | | define-c-callback | |------------------|:-----------------:| | Chibi | | @@ -137,8 +140,10 @@ Required versions: | STklos | | | **Ypsilon** | X | + ### Test files pass + | | primitives.scm | addressof.scm | callback.scm | |------------------|:--------------:|:-------------:|-------------:| | Chibi | X | X | | @@ -152,6 +157,7 @@ Required versions: | STklos | X | X | | | Ypsilon | X | X | | + ## Installation ### Snow-fort @@ -646,9 +652,9 @@ Setting environment variables like this on Windows works for this library: set "FOREIGN_C_LOAD_PATH=C:\Program Files (x86)/foo/bar" -#### FOREIGN_C_\_LOAD\_PATH +#### FOREIGN\_C_\_LOAD\_PATH To add more paths to where foreign c looks for libraries set -FOREIGN_C\_LOAD\_PATH to paths separated by ; on windows, and : on other +FOREIGN\_C\_LOAD\_PATH to paths separated by ; on windows, and : on other operating systems. diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test index 384ea27..bdf6763 100644 --- a/dockerfiles/Dockerfile.snow-chibi-install-test +++ b/dockerfiles/Dockerfile.snow-chibi-install-test @@ -18,7 +18,8 @@ RUN apt-get update && apt-get install -y \ build-essential \ git \ make \ - libffi-dev + libffi-dev \ + markdown RUN mkdir ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm COPY --from=build /chibi-scheme /chibi-scheme RUN cd /chibi-scheme && make -j 8 install diff --git a/dockerfiles/Dockerfile.test b/dockerfiles/Dockerfile.test index a855c54..a97b0dd 100644 --- a/dockerfiles/Dockerfile.test +++ b/dockerfiles/Dockerfile.test @@ -19,7 +19,8 @@ RUN apt-get update && apt-get install -y \ git \ ca-certificates \ make \ - libffi-dev + libffi-dev \ + markdown RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm COPY --from=build /chibi-scheme /chibi-scheme RUN cd /chibi-scheme && make -j 8 install