X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/c6aa0c4241ab80bc6e8339c516b7ce85277d4fb0..5a062513dae6be88cd77361fd84ce38577455994:/Makefile.am diff --git a/Makefile.am b/Makefile.am index cbfa69c..e0b5c2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code +CHECK_MAN = $(top_srcdir)/autotools/check-man REPLACE_VARS_SED = autotools/replace_vars.sed hypervisordir = $(pkgpythondir)/hypervisor @@ -23,6 +24,9 @@ rapidir = $(pkgpythondir)/rapi toolsdir = $(pkglibdir)/tools docdir = $(datadir)/doc/$(PACKAGE) +# Delete output file if an error occurred while building it +.DELETE_ON_ERROR: + DIRS = \ autotools \ daemons \ @@ -32,10 +36,10 @@ DIRS = \ doc/examples/hooks \ lib \ lib/build \ + lib/confd \ lib/http \ lib/hypervisor \ lib/rapi \ - lib/confd \ man \ qa \ scripts \ @@ -46,28 +50,25 @@ DIRS = \ MAINTAINERCLEANFILES = \ $(docpng) \ $(maninput) \ + doc/install-quick.rst \ 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 \ devel/upload \ doc/examples/bash_completion \ doc/examples/ganeti.initd \ 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) @@ -92,6 +93,7 @@ pkgpython_PYTHON = \ lib/bootstrap.py \ lib/cli.py \ lib/cmdlib.py \ + lib/compat.py \ lib/config.py \ lib/constants.py \ lib/daemon.py \ @@ -109,6 +111,7 @@ pkgpython_PYTHON = \ lib/ssh.py \ lib/storage.py \ lib/utils.py \ + lib/uidpool.py \ lib/workerpool.py hypervisor_PYTHON = \ @@ -122,6 +125,7 @@ hypervisor_PYTHON = \ rapi_PYTHON = \ lib/rapi/__init__.py \ lib/rapi/baserlib.py \ + lib/rapi/client.py \ lib/rapi/connector.py \ lib/rapi/rlib2.py @@ -134,8 +138,8 @@ http_PYTHON = \ 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 \ @@ -146,6 +150,7 @@ docrst = \ doc/hooks.rst \ doc/iallocator.rst \ doc/index.rst \ + doc/install-quick.rst \ doc/install.rst \ doc/locking.rst \ doc/news.rst \ @@ -156,7 +161,7 @@ docrst = \ doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac @test -n "$(SPHINX)" || \ { echo 'sphinx-build' not found during configure; exit 1; } - PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -b html \ + PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \ -d . \ -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \ -D release="$(PACKAGE_VERSION)" \ @@ -174,6 +179,14 @@ doc/news.rst: NEWS cat $<; \ } > $@ +doc/install-quick.rst: INSTALL + set -e; \ + { echo '.. This file is automatically updated at build time from $<.'; \ + echo '.. Do not edit.'; \ + echo; \ + cat $<; \ + } > $@ + docdot = \ doc/arch-2.0.dot \ doc/design-2.1-lock-acquire.dot \ @@ -189,6 +202,7 @@ noinst_DATA = \ doc/examples/bash_completion \ doc/examples/ganeti.cron \ doc/examples/ganeti.initd \ + doc/examples/gnt-config-backup \ doc/examples/hooks/ipsec \ $(manhtml) @@ -216,15 +230,25 @@ dist_tools_SCRIPTS = \ tools/burnin \ tools/cfgshell \ tools/cfgupgrade \ - tools/lvmstrap + tools/cfgupgrade12 \ + tools/cluster-merge \ + tools/lvmstrap \ + tools/sanitize-config + +pkglib_SCRIPTS = \ + daemons/daemon-util EXTRA_DIST = \ NEWS \ pylintrc \ autotools/build-bash-completion \ 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 \ devel/upload.in \ $(docdot) \ @@ -234,7 +258,10 @@ EXTRA_DIST = \ doc/html \ doc/examples/ganeti.initd.in \ doc/examples/ganeti.cron.in \ + doc/examples/gnt-config-backup.in \ doc/examples/dumb-allocator \ + doc/examples/ganeti.default \ + doc/examples/ganeti.default-debug \ doc/examples/hooks/ethers \ doc/examples/hooks/ipsec.in \ test/testutils.py \ @@ -286,41 +313,56 @@ TEST_FILES = \ 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) \ @@ -330,16 +372,26 @@ all_python_code = \ srclink_files = \ man/footer.sgml \ + test/daemon-util_unittest.bash \ $(all_python_code) check_python_code = \ + $(BUILD_BASH_COMPLETION) \ $(all_python_code) +lint_python_code = \ + ganeti \ + $(dist_sbin_SCRIPTS) \ + $(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 $@ -daemons/ganeti-cleaner: daemons/ganeti-cleaner.in \ +daemons/%: daemons/%.in \ $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod +x $@ @@ -364,6 +416,7 @@ man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER) @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)" || \ @@ -392,6 +445,10 @@ lib/_autoconf.py: Makefile stamp-directories echo ''; \ echo '"""'; \ echo ''; \ + echo '# pylint: disable-msg=C0301,C0324'; \ + echo '# because this is autogenerated, we do not want'; \ + echo '# style warnings' ; \ + echo ''; \ echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \ echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \ echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \ @@ -400,20 +457,24 @@ lib/_autoconf.py: Makefile stamp-directories echo "VERSION_FULL = '$(VERSION_FULL)'"; \ echo "LOCALSTATEDIR = '$(localstatedir)'"; \ echo "SYSCONFDIR = '$(sysconfdir)'"; \ - echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \ + 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 "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \ - echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \ + echo "SOCAT_PATH = '$(SOCAT)'"; \ + echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \ echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \ echo "TOOLSDIR = '$(toolsdir)'"; \ echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \ + echo "PKGLIBDIR = '$(pkglibdir)'"; \ + echo "DRBD_BARRIERS = $(DRBD_BARRIERS)"; \ + echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \ } > $@ $(REPLACE_VARS_SED): Makefile @@ -428,6 +489,7 @@ $(REPLACE_VARS_SED): Makefile echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \ echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \ echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \ + echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \ echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \ } > $@ @@ -449,6 +511,11 @@ ganeti: check-local: $(CHECK_PYTHON_CODE) $(check_python_code) +.PHONY: lint +lint: ganeti $(BUILT_SOURCES) + @test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; } + $(PYLINT) $(LINT_OPTS) $(lint_python_code) + # a dist hook rule for catching revision control directories distcheck-hook: if find $(top_distdir) -name .svn -or -name .git | grep .; then \ @@ -474,17 +541,29 @@ stamp-directories: Makefile touch $@ .PHONY: apidoc -apidoc: epydoc.conf $(RUN_IN_TEMPDIR) +apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES) test -e doc/api || mkdir doc/api $(RUN_IN_TEMPDIR) epydoc -v \ --conf $(CURDIR)/epydoc.conf \ --output $(CURDIR)/doc/api .PHONY: TAGS -TAGS: +TAGS: $(BUILT_SOURCES) rm -f TAGS find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \ -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 :