|
|
|
@ -93,7 +93,7 @@ test:
|
|
|
|
|
cd /yadm && \
|
|
|
|
|
py.test -v $(testargs); \
|
|
|
|
|
else \
|
|
|
|
|
if command -v "docker-compose" &> /dev/null; then \
|
|
|
|
|
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."; \
|
|
|
|
@ -197,7 +197,7 @@ sync-clock:
|
|
|
|
|
|
|
|
|
|
.PHONY: require-docker
|
|
|
|
|
require-docker:
|
|
|
|
|
@if ! command -v "docker" &> /dev/null; then \
|
|
|
|
|
@if ! command -v "docker" > /dev/null 2>&1; then \
|
|
|
|
|
echo "Sorry, this make target requires docker to be installed."; \
|
|
|
|
|
false; \
|
|
|
|
|
fi
|
|
|
|
|