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:
Billy Olsen 2016-03-15 20:08:30 -07:00
parent 2014a12c2b
commit 5eb7fb5b65

View File

@ -2,14 +2,11 @@
PYTHON := /usr/bin/env python
lint:
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
hooks tests unit_tests
@charm proof
@tox -e pep8
test:
@# Bundletester expects unit tests here.
@echo Starting unit tests...
@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
@tox -e py27
functional_test:
@echo Starting Amulet tests...