783cdd2dc5
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: I8f812b70050b0ae1638e4f77bb29054997054854
30 lines
673 B
Makefile
30 lines
673 B
Makefile
#!/usr/bin/make
|
|
PYTHON := /usr/bin/env python
|
|
|
|
lint:
|
|
@tox -e pep8
|
|
|
|
test:
|
|
@echo Starting unit tests...
|
|
@tox -e py27
|
|
|
|
functional_test:
|
|
@echo Starting Amulet tests...
|
|
@tests/setup/00-setup
|
|
@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
|
|
|
|
bin/charm_helpers_sync.py:
|
|
@mkdir -p bin
|
|
@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
|
|
> bin/charm_helpers_sync.py
|
|
|
|
sync: bin/charm_helpers_sync.py
|
|
@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
|
|
@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
|
|
|
|
publish: lint test
|
|
bzr push lp:charms/glance
|
|
bzr push lp:charms/trusty/glance
|
|
|
|
all: test lint
|