summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-03 12:53:41 -0500
committerScott Moser <smoser@ubuntu.com>2016-03-03 12:53:41 -0500
commit112d25e6b2a20e8e39c1f22f6a30e0130616c64f (patch)
tree31f921f29748fb79b961c5256f5eea3f92bc7b1c /Makefile
parentc496b6a11d504ef62371cb5e03ac80b4ceb37540 (diff)
downloadvyos-cloud-init-112d25e6b2a20e8e39c1f22f6a30e0130616c64f.tar.gz
vyos-cloud-init-112d25e6b2a20e8e39c1f22f6a30e0130616c64f.zip
make package build run tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8987d51c..a7fa5a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
CWD=$(shell pwd)
PY_FILES=$(shell find cloudinit bin tests tools -name "*.py" -type f )
PY_FILES+="bin/cloud-init"
+noseopts ?= -v
YAML_FILES=$(shell find cloudinit bin tests tools -name "*.yaml" -type f )
YAML_FILES+=$(shell find doc/examples -name "cloud-config*.txt" -type f )
@@ -33,8 +34,7 @@ pip-test-requirements:
$(PIP_INSTALL) -r "$@.txt" -q
test: clean_pyc
- @echo "Running tests..."
- @nosetests $(noseopts) tests/
+ @n=$$(which nosetests3) || n=nosetests; set -- $$n $(noseopts) tests/; echo "Running $$*"; "$$@"
check_version:
@if [ "$(CHANGELOG_VERSION)" != "$(CODE_VERSION)" ]; then \