mirror of
https://github.com/TheLocehiliosan/yadm
synced 2026-03-02 03:49:29 +00:00
Remove the requirement on docker-compose for running tests
Besides simplifying the setup it also has the nice side-effect of being able to override the docker image on the command line: $ make test IMAGE=foobar
This commit is contained in:
8
Makefile
8
Makefile
@@ -93,12 +93,8 @@ test:
|
||||
cd /yadm && \
|
||||
py.test -v $(testargs); \
|
||||
else \
|
||||
if command -v "docker-compose" > /dev/null 2>&1; then \
|
||||
docker-compose run --rm testbed make test testargs="$(testargs)"; \
|
||||
else \
|
||||
echo "Sorry, this make test requires docker-compose to be installed."; \
|
||||
false; \
|
||||
fi \
|
||||
$(MAKE) -s require-docker && \
|
||||
docker run --rm -it -v "$(CURDIR):/yadm:ro" $(IMAGE) make test testargs="$(testargs)"; \
|
||||
fi
|
||||
|
||||
.PHONY: testhost
|
||||
|
||||
Reference in New Issue
Block a user