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: Ibd881d74cbc10b16d4fa8a8ddb8aee01806e56c6
This commit is contained in:
Billy Olsen 2016-03-15 20:09:34 -07:00
parent 0a046d144b
commit 26078d6ac7
1 changed files with 2 additions and 5 deletions

View File

@ -4,14 +4,11 @@ CHARM_DIR := $(pwd)
export CHARM_DIR
lint:
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
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...