Merge branch 'stable-2.6'

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ad1b009..7a2d359 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -498,6 +498,7 @@ PYTHON_BOOTSTRAP = \
        tools/ensure-dirs
 
 qa_scripts = \
+       qa/__init__.py \
        qa/ganeti-qa.py \
        qa/qa_cluster.py \
        qa/qa_config.py \
@@ -506,6 +507,7 @@ qa_scripts = \
        qa/qa_error.py \
        qa/qa_group.py \
        qa/qa_instance.py \
+       qa/qa_job.py \
        qa/qa_node.py \
        qa/qa_os.py \
        qa/qa_rapi.py \
@@ -635,6 +637,7 @@ EXTRA_DIST = \
        autotools/docpp \
        autotools/gen-coverage \
        autotools/testrunner \
+       autotools/wrong-hardcoded-paths \
        $(RUN_IN_TEMPDIR) \
        daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \
@@ -785,6 +788,7 @@ TEST_FILES = \
        test/htools-text-backend.test
 
 python_tests = \
+       doc/examples/rapi_testutils.py \
        test/ganeti.asyncnotifier_unittest.py \
        test/ganeti.backend_unittest.py \
        test/ganeti.bdev_unittest.py \
@@ -845,6 +849,7 @@ python_tests = \
        test/ganeti.utils.x509_unittest.py \
        test/ganeti.utils_unittest.py \
        test/ganeti.workerpool_unittest.py \
+       test/qa.qa_config_unittest.py \
        test/cfgupgrade_unittest.py \
        test/docs_unittest.py \
        test/pycurl_reset_unittest.py \
@@ -995,6 +1000,11 @@ man/footer.html: man/footer.rst
 
 man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \
        lib/build/shell_example_lexer.py
+       @echo "Checking $< for hardcoded paths..."
+       @if grep -nEf autotools/wrong-hardcoded-paths $<; then \
+         echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \
+         exit 1; \
+       fi
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@
 
 man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.man
@@ -1053,7 +1063,8 @@ htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in vcs-version
        sed -e "s/%ver%/$$VCSVER/" < $< > $@
 
 htools/Ganeti/Constants.hs: htools/Ganeti/Constants.hs.in \
-       lib/constants.py lib/_autoconf.py $(CONVERT_CONSTANTS) \
+       lib/constants.py lib/_autoconf.py lib/luxi.py \
+       $(CONVERT_CONSTANTS) \
        | lib/_vcsversion.py
        set -e; \
        { cat $< ; PYTHONPATH=. $(CONVERT_CONSTANTS); } > $@