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: I11249804cc82df72a6f8c28664beba4130fb27c4
This commit is contained in:
Billy Olsen 2016-03-15 20:09:15 -07:00
parent fd84739de8
commit 9af6715fca
1 changed files with 2 additions and 5 deletions

View File

@ -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 unit tests...
@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
@tox -e py27
functional_test:
@echo Starting Amulet tests...