Make ctrf library output failed tests. Clean up makefile
This commit is contained in:
parent
c0beecc251
commit
03fc4b05fc
45
Makefile
45
Makefile
|
|
@ -1,9 +1,3 @@
|
|||
TMPDIR=.tmp/${SCHEME}
|
||||
|
||||
.SILENT: build install test-r6rs test-r6rs-docker test-r7rs test-r7rs-docker \
|
||||
clean ${TMPDIR}
|
||||
.PHONY: ${TMPDIR}
|
||||
|
||||
SCHEME=chibi
|
||||
RNRS=r7rs
|
||||
LIBRARY=ctrf
|
||||
|
|
@ -16,6 +10,7 @@ README=retropikzel/${LIBRARY}/README.html
|
|||
TESTFILE=retropikzel/${LIBRARY}/test.scm
|
||||
|
||||
PKG=${AUTHOR}-${LIBRARY}-${VERSION}.tgz
|
||||
MOUTHPKG=${AUTHOR}-mouth-$(shell cat retropikzel/mouth/VERSION).tgz
|
||||
|
||||
DOCKERIMG=${SCHEME}:head
|
||||
ifeq "${SCHEME}" "chicken"
|
||||
|
|
@ -38,10 +33,13 @@ uninstall:
|
|||
init-venv: build
|
||||
@rm -rf venv
|
||||
@scheme-venv ${SCHEME} ${RNRS} venv
|
||||
@echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (srfi 64) (retropikzel ${LIBRARY}))" > venv/test.scm
|
||||
@printf "#!r6rs\n(import (rnrs) (srfi :64) (srfi :98) (retropikzel ${LIBRARY}))" > venv/test.sps
|
||||
@echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (retropikzel mouth) (srfi 64) (retropikzel ctrf) (retropikzel ${LIBRARY}))" > venv/test.scm
|
||||
@echo "(test-runner-current (ctrf-runner))" >> venv/test.scm
|
||||
@printf "#!r6rs\n(import (rnrs) (srfi :64) (srfi :98) (retropikzel mouth) (retropikzel ${LIBRARY}))" > venv/test.sps
|
||||
@cat ${TESTFILE} >> venv/test.scm
|
||||
@cat ${TESTFILE} >> venv/test.sps
|
||||
@if [ "${RNRS}" = "r7rs" ]; then ./venv/bin/snow-chibi install retropikzel.mouth; fi
|
||||
@if [ "${RNRS}" = "r7rs" ]; then ./venv/bin/snow-chibi install --always-yes retropikzel.ctrf; fi
|
||||
@if [ "${RNRS}" = "r6rs" ]; then if [ -d ../foreign-c ]; then cp -r ../foreign-c/foreign venv/lib/; fi; fi
|
||||
@if [ "${RNRS}" = "r6rs" ]; then if [ -d ../foreign-c-srfis ]; then cp -r ../foreign-c-srfis/srfi venv/lib/; fi; fi
|
||||
@if [ "${RNRS}" = "r6rs" ]; then cp -r retropikzel venv/lib/; fi
|
||||
|
|
@ -59,36 +57,5 @@ run-test: init-venv
|
|||
if [ "${RNRS}" = "r7rs" ]; then VENV_CSC_ARGS="-L -lcurl" ./venv/bin/scheme-compile venv/test.scm; fi
|
||||
./venv/test
|
||||
|
||||
${TMPDIR}:
|
||||
mkdir -p ${TMPDIR}
|
||||
mkdir -p ${TMPDIR}/retropikzel
|
||||
cp -r retropikzel/${LIBRARY} ${TMPDIR}/retropikzel/
|
||||
cp -r retropikzel/${LIBRARY}.s* ${TMPDIR}/retropikzel/
|
||||
if [ -d srfi ]; then cp -r srfi ${TMPDIR}/; fi
|
||||
|
||||
test-r6rs: ${TMPDIR}
|
||||
cd ${TMPDIR} && printf "#!r6rs\n(import (rnrs base) (rnrs control) (rnrs io simple) (rnrs files) (rnrs programs) (srfi :64) (retropikzel ${LIBRARY}))\n" > test-r6rs.sps
|
||||
cat ${TESTFILE} >> ${TMPDIR}/test-r6rs.sps
|
||||
cd ${TMPDIR} && snow-chibi install --impls=${SCHEME} --install-source-dir=. --install-library-dir=. --always-yes srfi.180
|
||||
cd ${TMPDIR} && akku install chez-srfi akku-r7rs srfi.180
|
||||
cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} timeout 120 compile-scheme -I .akku/lib -o test-r6rs test-r6rs.sps
|
||||
cd ${TMPDIR} && timeout 120 ./test-r6rs
|
||||
|
||||
test-r6rs-docker: ${TMPDIR}
|
||||
echo "Building docker image..."
|
||||
docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test .
|
||||
docker run -p 3001:3001 -t ${DOCKER_TAG} sh -c "lighttpd -f fcgi-lighttpd.conf && make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs"
|
||||
|
||||
test-r7rs: ${TMPDIR}
|
||||
cd ${TMPDIR} && echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (srfi 64) (retropikzel ${LIBRARY}))" > test-r7rs.scm
|
||||
cat ${TESTFILE} >> ${TMPDIR}/test-r7rs.scm
|
||||
cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} timeout 120 compile-scheme -I . -o test-r7rs test-r7rs.scm
|
||||
cd ${TMPDIR} && timeout 120 ./test-r7rs
|
||||
|
||||
test-r7rs-docker: ${TMPDIR}
|
||||
echo "Building docker image..."
|
||||
docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test .
|
||||
docker run -p 3001:3001 -t ${DOCKER_TAG} sh -c "lighttpd -f fcgi-lighttpd.conf && make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} build install test-r7rs"
|
||||
|
||||
clean:
|
||||
git clean -X -f
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
1.0.0
|
||||
1.1.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue