9f1239ce3f
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: If9ca62cac161b02cd856f944e9f43c0dcfc35109
29 lines
686 B
Makefile
29 lines
686 B
Makefile
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/swift-proxy
|
|
bzr push lp:charms/trusty/swift-proxy
|
|
|
|
.PHONY: lint unit_test test sync publish
|