Generalize the reading of test file data

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6c4b2c6..a76de28 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,6 @@ DIRS = \
        lib/rapi \
        man \
        qa \
-       qa/hooks \
        scripts \
        test \
        test/data \
@@ -51,7 +50,6 @@ CLEANFILES = \
        man/*.[78] \
        man/*.in \
        qa/*.py[co] \
-       qa/hooks/*.py[co] \
        test/*.py[co] \
        stamp-directories \
        $(nodist_pkgpython_PYTHON)
@@ -68,12 +66,12 @@ pkgpython_PYTHON = \
        lib/cmdlib.py \
        lib/config.py \
        lib/constants.py \
+       lib/daemon.py \
        lib/errors.py \
        lib/http.py \
        lib/jqueue.py \
        lib/jstore.py \
        lib/locking.py \
-       lib/logger.py \
        lib/luxi.py \
        lib/mcpu.py \
        lib/objects.py \
@@ -94,7 +92,6 @@ hypervisor_PYTHON = \
 
 rapi_PYTHON = \
        lib/rapi/__init__.py \
-       lib/rapi/httperror.py \
        lib/rapi/baserlib.py \
        lib/rapi/connector.py \
        lib/rapi/rlib1.py \
@@ -108,7 +105,20 @@ docsgml = \
        doc/rapi.sgml \
        doc/iallocator.sgml
 
+docrst = \
+       doc/design-2.0-cluster-parameters.rst \
+       doc/design-2.0-commandline-parameters.rst \
+       doc/design-2.0-disk-handling.rst \
+       doc/design-2.0-index.rst \
+       doc/design-2.0-job-queue.rst \
+       doc/design-2.0-locking.rst \
+       doc/design-2.0-master-daemon.rst \
+       doc/design-2.0-os-interface.rst \
+       doc/design-2.0-rapi-changes.rst \
+       doc/security.rst
+
 doc_DATA = \
+       $(patsubst %.rst,%.html,$(docrst)) \
        $(patsubst %.sgml,%.html,$(docsgml)) \
        $(patsubst %.sgml,%.pdf,$(docsgml))
 
@@ -136,13 +146,13 @@ EXTRA_DIST = \
        DEVNOTES \
        autotools/docbook-wrapper \
        devel/upload.in \
+       $(docrst) \
        $(docsgml) \
        doc/build-rapi-resources-doc \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
-       qa/hooks/datehook.py \
-       qa/hooks/loghook.py \
+       doc/locking.txt \
        test/testutils.py \
        test/mocks.py \
        $(dist_TESTS) \
@@ -150,7 +160,7 @@ EXTRA_DIST = \
        man/footer.sgml \
        $(mansgml) \
        qa/ganeti-qa.py \
-       qa/qa-sample.yaml \
+       qa/qa-sample.json \
        qa/qa_cluster.py \
        qa/qa_config.py \
        qa/qa_daemon.py \
@@ -159,7 +169,6 @@ EXTRA_DIST = \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \
-       qa/qa_other.py \
        qa/qa_rapi.py \
        qa/qa_tags.py \
        qa/qa_utils.py
@@ -195,7 +204,8 @@ dist_TESTS = \
        test/ganeti.workerpool_unittest.py \
        test/ganeti.rapi.resources_unittest.py \
        test/ganeti.http_unittest.py \
-       test/ganeti.constants_unittest.py
+       test/ganeti.constants_unittest.py \
+       test/ganeti.cli_unittest.py
 
 nodist_TESTS =
 
@@ -222,21 +232,24 @@ man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
 
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
+doc/%.html: doc/%.rst
+       $(RST2HTML) $< $@
 
-doc/rapi.pdf doc/rapi.html: doc/rapi-resources.sgml
+doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
 
 doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
        PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
 
 man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/footer.sgml $(TESTS): srclinks