Use tox in Makefile targets
Modify the Makefile to point at the appropriate tox targets so that tox and Make output can be equivalent. This involves mapping the lint target to the pep8 target and the test target to the py27 target. Change-Id: I40bf0c72416e8c9a9f079a7800c9c343872ee907
This commit is contained in:
parent
92817fc5ad
commit
2a3da6884e
7
Makefile
7
Makefile
@ -2,14 +2,11 @@
|
||||
PYTHON := /usr/bin/env python
|
||||
|
||||
lint:
|
||||
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
|
||||
hooks unit_tests tests
|
||||
@charm proof
|
||||
@tox -e pep8
|
||||
|
||||
test:
|
||||
@# Bundletester expects unit tests here.
|
||||
@echo Starting unit tests...
|
||||
@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
|
||||
@tox -e py27
|
||||
|
||||
functional_test:
|
||||
@echo Starting amulet tests...
|
||||
|
Loading…
Reference in New Issue
Block a user