Tox is not available on osci atm so revert to using old method with CHARM_DIR set
This commit is contained in:
parent
e445dfbaf1
commit
89821254ff
9
Makefile
9
Makefile
|
@ -1,16 +1,17 @@
|
|||
#!/usr/bin/make
|
||||
PYTHON := /usr/bin/env python
|
||||
TOX := /usr/bin/env tox
|
||||
CHARM_DIR := $(pwd)
|
||||
export CHARM_DIR
|
||||
|
||||
lint:
|
||||
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
|
||||
hooks unit_tests tests
|
||||
@$(TOX) -e lint
|
||||
@charm proof
|
||||
|
||||
test:
|
||||
@# Bundletester expects unit tests here.
|
||||
@echo Starting tests...
|
||||
@$(TOX) -e py27-trusty
|
||||
@echo Starting unit tests...
|
||||
@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
|
||||
|
||||
functional_test:
|
||||
@echo Starting Amulet tests...
|
||||
|
|
Loading…
Reference in New Issue