doc/examples/hooks \
lib \
lib/build \
+ lib/confd \
lib/http \
lib/hypervisor \
lib/rapi \
- lib/confd \
man \
qa \
scripts \
doc/news.rst
maintainer-clean-local:
- rm -rf doc/api doc/html
+ rm -rf doc/api doc/html doc/coverage
CLEANFILES = \
+ $(addsuffix /*.py[co],$(DIRS)) \
autotools/replace_vars.sed \
daemons/daemon-util \
daemons/ganeti-cleaner \
doc/examples/ganeti.cron \
doc/examples/gnt-config-backup \
doc/examples/hooks/ipsec \
- lib/*.py[co] \
- lib/build/*.py[co] \
- lib/http/*.py[co] \
- lib/hypervisor/*.py[co] \
- lib/rapi/*.py[co] \
$(man_MANS) \
$(manhtml) \
- qa/*.py[co] \
- test/*.py[co] \
stamp-directories \
stamp-srclinks \
$(nodist_pkgpython_PYTHON)
lib/bootstrap.py \
lib/cli.py \
lib/cmdlib.py \
+ lib/compat.py \
lib/config.py \
lib/constants.py \
lib/daemon.py \
lib/ssh.py \
lib/storage.py \
lib/utils.py \
+ lib/uidpool.py \
lib/workerpool.py
hypervisor_PYTHON = \
rapi_PYTHON = \
lib/rapi/__init__.py \
lib/rapi/baserlib.py \
+ lib/rapi/client.py \
lib/rapi/connector.py \
lib/rapi/rlib2.py
confd_PYTHON = \
lib/confd/__init__.py \
lib/confd/client.py \
- lib/confd/server.py \
- lib/confd/querylib.py
+ lib/confd/querylib.py \
+ lib/confd/server.py
docrst = \
doc/admin.rst \
tools/burnin \
tools/cfgshell \
tools/cfgupgrade \
- tools/lvmstrap
+ tools/cfgupgrade12 \
+ tools/cluster-merge \
+ tools/lvmstrap \
+ tools/sanitize-config
pkglib_SCRIPTS = \
daemons/daemon-util
autotools/check-python-code \
autotools/check-man \
autotools/docbook-wrapper \
+ autotools/gen-coverage \
+ autotools/testrunner \
$(RUN_IN_TEMPDIR) \
daemons/daemon-util.in \
daemons/ganeti-cleaner.in \
test/data/bdev-8.3-both.txt \
test/data/bdev-disk.txt \
test/data/bdev-net.txt \
+ test/data/cert1.pem \
test/data/proc_drbd8.txt \
test/data/proc_drbd80-emptyline.txt \
test/data/proc_drbd83.txt
-dist_TESTS = \
+python_tests = \
test/ganeti.bdev_unittest.py \
test/ganeti.cli_unittest.py \
test/ganeti.cmdlib_unittest.py \
- test/ganeti.confd_client_unittest.py \
+ test/ganeti.compat_unittest.py \
+ test/ganeti.confd.client_unittest.py \
test/ganeti.config_unittest.py \
test/ganeti.constants_unittest.py \
+ test/ganeti.errors_unittest.py \
test/ganeti.hooks_unittest.py \
test/ganeti.http_unittest.py \
test/ganeti.locking_unittest.py \
test/ganeti.mcpu_unittest.py \
test/ganeti.objects_unittest.py \
+ test/ganeti.opcodes_unittest.py \
+ test/ganeti.rapi.client_unittest.py \
test/ganeti.rapi.resources_unittest.py \
test/ganeti.serializer_unittest.py \
test/ganeti.ssh_unittest.py \
+ test/ganeti.uidpool_unittest.py \
test/ganeti.utils_unittest.py \
test/ganeti.workerpool_unittest.py \
- test/docs_unittest.py
+ test/docs_unittest.py \
+ test/tempfile_fork_unittest.py
+
+dist_TESTS = \
+ test/daemon-util_unittest.bash \
+ $(python_tests)
nodist_TESTS =
TESTS = $(dist_TESTS) $(nodist_TESTS)
+# Environment for all tests
+PLAIN_TESTS_ENVIRONMENT = \
+ PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) $(RUN_IN_TEMPDIR)
+
+# Environment for tests run by automake
TESTS_ENVIRONMENT = \
- PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) \
- $(RUN_IN_TEMPDIR) $(PYTHON)
+ $(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/testrunner
all_python_code = \
$(dist_sbin_SCRIPTS) \
$(dist_tools_SCRIPTS) \
- $(dist_TESTS) \
+ $(python_tests) \
$(pkgpython_PYTHON) \
$(hypervisor_PYTHON) \
$(rapi_PYTHON) \
srclink_files = \
man/footer.sgml \
+ test/daemon-util_unittest.bash \
$(all_python_code)
check_python_code = \
$(dist_tools_SCRIPTS) \
$(BUILD_BASH_COMPLETION)
+test/daemon-util_unittest.bash: daemons/daemon-util
+
devel/upload: devel/upload.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod u+x $@
@test -n "$(DOCBOOK2MAN)" || \
{ echo 'docbook2man' not found during configure; exit 1; }
$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
+ $(CHECK_MAN) $@
man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
@test -n "$(DOCBOOK2HTML)" || \
man/%.7: man/%.7.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
- $(CHECK_MAN) $@
man/%.8: man/%.8.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
- $(CHECK_MAN) $@
man/%.html: man/%.html.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
echo "VERSION_FULL = '$(VERSION_FULL)'"; \
echo "LOCALSTATEDIR = '$(localstatedir)'"; \
echo "SYSCONFDIR = '$(sysconfdir)'"; \
+ echo "SSH_CONFIG_DIR = '$(SSH_CONFIG_DIR)'"; \
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
echo "XEN_INITRD = '$(XEN_INITRD)'"; \
echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
+ echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
echo "KVM_PATH = '$(KVM_PATH)'"; \
echo "SOCAT_PATH = '$(SOCAT)'"; \
-path 'daemons/ganeti-*' -o -path 'tools/*' | \
etags -
+.PHONY: coverage
+coverage: $(BUILT_SOURCES) $(python_tests)
+ set -e; \
+ mkdir -p doc/coverage; \
+ COVERAGE_FILE=$(CURDIR)/doc/coverage/data \
+ TEXT_COVERAGE=$(CURDIR)/doc/coverage/report.txt \
+ HTML_COVERAGE=$(CURDIR)/doc/coverage \
+ $(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/gen-coverage \
+ $(python_tests)
+
+commit-check: distcheck lint apidoc
+
# vim: set noet :