Fix testing

This commit is contained in:
retropikzel 2025-12-11 18:27:37 +02:00
parent cce660e2d5
commit 2f4918264a
1 changed files with 3 additions and 3 deletions

View File

@ -5,7 +5,7 @@ TMPDIR=.tmp/${SCHEME}
.PHONY: ${TMPDIR} .PHONY: ${TMPDIR}
SCHEME=chibi SCHEME=chibi
LIBRARY=cgi LIBRARY=ctrf
AUTHOR=retropikzel AUTHOR=retropikzel
LIBRARY_FILE=retropikzel/${LIBRARY}.sld LIBRARY_FILE=retropikzel/${LIBRARY}.sld
@ -53,7 +53,7 @@ test-r6rs: ${TMPDIR}
test-r6rs-docker: ${TMPDIR} test-r6rs-docker: ${TMPDIR}
echo "Building docker image..." echo "Building docker image..."
docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null
docker stop $$(docker ps -a -q --filter ancestor=${DOCKER_TAG} --format="{{.ID}}") 2>&1 > /dev/null || true docker stop $$(docker ps -a -q --filter ancestor=${DOCKER_TAG} --format="{{.ID}}") > /dev/null || true
docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs" docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r6rs"
test-r7rs: ${TMPDIR} test-r7rs: ${TMPDIR}
@ -65,7 +65,7 @@ test-r7rs: ${TMPDIR}
test-r7rs-docker: ${TMPDIR} test-r7rs-docker: ${TMPDIR}
echo "Building docker image..." echo "Building docker image..."
docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${SCHEME} --tag=${DOCKER_TAG} -f Dockerfile.test ${DOCKER_QUIET} . > /dev/null
docker stop $$(docker ps -a -q --filter ancestor=${DOCKER_TAG} --format="{{.ID}}") 2>&1 > /dev/null || true docker stop $$(docker ps -a -q --filter ancestor=${DOCKER_TAG} --format="{{.ID}}") > /dev/null || true
docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs" docker run -t ${DOCKER_TAG} sh -c "make SCHEME=${SCHEME} SNOW_CHIBI_ARGS=--always-yes LIBRARY=${LIBRARY} test-r7rs"
clean: clean: