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: Iee67a6bf266c8a7ded52fe1bdfde4ce59e5bea8e
This commit is contained in:
parent
d3a7bde091
commit
fcfd9c38bf
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 -v --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