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: I7216b8338ca3f548b6b373821d2bf9a4dca37286
This commit is contained in:
parent
2014a12c2b
commit
5eb7fb5b65
7
Makefile
7
Makefile
@ -2,14 +2,11 @@
|
|||||||
PYTHON := /usr/bin/env python
|
PYTHON := /usr/bin/env python
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
|
@tox -e pep8
|
||||||
hooks tests unit_tests
|
|
||||||
@charm proof
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
@# Bundletester expects unit tests here.
|
|
||||||
@echo Starting unit tests...
|
@echo Starting unit tests...
|
||||||
@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
|
@tox -e py27
|
||||||
|
|
||||||
functional_test:
|
functional_test:
|
||||||
@echo Starting Amulet tests...
|
@echo Starting Amulet tests...
|
||||||
|
Loading…
Reference in New Issue
Block a user