diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -15,9 +15,9 @@ ifeq ($(distro),) distro = redhat endif -all: test check_version +all: check -check: pep8 pyflakes pyflakes3 unittest +check: check_version pep8 pyflakes pyflakes3 test pep8: @$(CWD)/tools/run-pep8 @@ -28,7 +28,7 @@ pyflakes: pyflakes3: @$(CWD)/tools/run-pyflakes3 -unittest: +unittest: clean_pyc nosetests $(noseopts) tests/unittests nosetests3 $(noseopts) tests/unittests @@ -40,9 +40,7 @@ pip-test-requirements: @echo "Installing cloud-init test dependencies..." $(PIP_INSTALL) -r "$@.txt" -q -test: clean_pyc - @echo "Running tests..." - @nosetests $(noseopts) tests/ +test: unittest check_version: @if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \ @@ -68,5 +66,5 @@ rpm: deb: ./packages/bddeb -.PHONY: test pyflakes 2to3 clean pep8 rpm deb yaml check_version -.PHONY: pip-test-requirements pip-requirements clean_pyc +.PHONY: test pyflakes pyflakes3 2to3 clean pep8 rpm deb yaml check_version +.PHONY: pip-test-requirements pip-requirements clean_pyc unittest |