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: I9dd0998ef410bdd725ec0cfde1f94379bd38b060
This commit is contained in:
parent
528d63c1e8
commit
6c24849607
7
Makefile
7
Makefile
@ -2,14 +2,11 @@
|
||||
PYTHON := /usr/bin/env python
|
||||
|
||||
lint:
|
||||
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
|
||||
actions hooks unit_tests tests
|
||||
@charm proof
|
||||
@tox -e pep8
|
||||
|
||||
test:
|
||||
@# Bundletester expects unit tests here
|
||||
@echo Starting 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