Abstract the confd client creation
[ganeti-local] / Makefile.am
index 75d5387..c6e5e86 100644 (file)
@@ -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 \
@@ -50,7 +54,7 @@ MAINTAINERCLEANFILES = \
        doc/news.rst
 
 maintainer-clean-local:
-       rm -rf doc/api doc/html
+       rm -rf doc/api doc/html doc/coverage
 
 CLEANFILES = \
        autotools/replace_vars.sed \
@@ -229,6 +233,7 @@ dist_tools_SCRIPTS = \
        tools/burnin \
        tools/cfgshell \
        tools/cfgupgrade \
+       tools/cluster-merge \
        tools/lvmstrap
 
 pkglib_SCRIPTS = \
@@ -239,7 +244,10 @@ EXTRA_DIST = \
        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 \
@@ -253,6 +261,8 @@ EXTRA_DIST = \
        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 \
@@ -304,41 +314,53 @@ 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.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.resources_unittest.py \
        test/ganeti.serializer_unittest.py \
        test/ganeti.ssh_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) \
@@ -348,12 +370,21 @@ all_python_code = \
 
 srclink_files = \
        man/footer.sgml \
+       test/daemon-util_unittest.bash \
        $(all_python_code)
 
 check_python_code = \
-       autotools/build-bash-completion \
+       $(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 $@
@@ -383,6 +414,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)" || \
@@ -394,6 +426,7 @@ man/%.7: man/%.7.in $(REPLACE_VARS_SED)
 
 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) < $< > $@
@@ -423,12 +456,14 @@ lib/_autoconf.py: Makefile stamp-directories
          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)'"; \
@@ -437,6 +472,8 @@ lib/_autoconf.py: Makefile stamp-directories
          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
@@ -474,8 +511,9 @@ check-local:
        $(CHECK_PYTHON_CODE) $(check_python_code)
 
 .PHONY: lint
-lint: ganeti
-       pylint $(LINT_OPTS) ganeti $(dist_sbin_SCRIPTS) $(dist_tools_SCRIPTS)
+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:
@@ -502,17 +540,27 @@ 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)
+
 # vim: set noet :