sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix small behavioral oddity in makefile

Browse source
This commit is contained in:
Markus Unterwaditzer 2017-10-01 19:50:43 +02:00
parent af4cb4624c
commit c507e12e0d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -29,6 +29,7 @@ PYTEST_ARGS =
# Variables below this line are not very interesting for getting started. # Variables below this line are not very interesting for getting started.
TEST_EXTRA_PACKAGES = TEST_EXTRA_PACKAGES =
ifeq ($(COVERAGE), true) ifeq ($(COVERAGE), true)
TEST_EXTRA_PACKAGES += pytest-cov TEST_EXTRA_PACKAGES += pytest-cov
PYTEST_ARGS += --cov-config .coveragerc --cov vdirsyncer PYTEST_ARGS += --cov-config .coveragerc --cov vdirsyncer
@ -39,21 +40,23 @@ ifeq ($(ETESYNC_TESTS), true)
TEST_EXTRA_PACKAGES += django djangorestframework wsgi_intercept drf-nested-routers TEST_EXTRA_PACKAGES += django djangorestframework wsgi_intercept drf-nested-routers
endif endif
PYTEST = py.test $(PYTEST_ARGS)
export TESTSERVER_BASE := ./tests/storage/servers/ export TESTSERVER_BASE := ./tests/storage/servers/
CODECOV_PATH = /tmp/codecov.sh CODECOV_PATH = /tmp/codecov.sh
ifeq ($(CI), true) ifeq ($(CI), true)
test: test:
curl -s https://codecov.io/bash > $(CODECOV_PATH) curl -s https://codecov.io/bash > $(CODECOV_PATH)
py.test $(PYTEST_ARGS) tests/unit/ $(PYTEST) tests/unit/
bash $(CODECOV_PATH) -c -F unit bash $(CODECOV_PATH) -c -F unit
py.test $(PYTEST_ARGS) tests/system/ $(PYTEST) tests/system/
bash $(CODECOV_PATH) -c -F system bash $(CODECOV_PATH) -c -F system
py.test $(PYTEST_ARGS) tests/storage/ $(PYTEST) tests/storage/
bash $(CODECOV_PATH) -c -F storage bash $(CODECOV_PATH) -c -F storage
else else
test: test:
py.test $(PYTEST_ARGS) $(PYTEST)
endif endif
all: all: