htest/Types.hs: check ordering of some ADTs

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dfd8370..6c2275b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,6 +332,8 @@ server_PYTHON = \
 pytools_PYTHON = \
        lib/tools/__init__.py \
        lib/tools/ensure_dirs.py \
+       lib/tools/node_cleanup.py \
+       lib/tools/node_daemon_setup.py \
        lib/tools/prepare_node_join.py
 
 utils_PYTHON = \
@@ -616,6 +618,8 @@ PYTHON_BOOTSTRAP_SBIN = \
 PYTHON_BOOTSTRAP = \
        $(PYTHON_BOOTSTRAP_SBIN) \
        tools/ensure-dirs \
+       tools/node-cleanup \
+       tools/node-daemon-setup \
        tools/prepare-node-join
 
 qa_scripts = \
@@ -718,7 +722,11 @@ dist_tools_SCRIPTS = \
        tools/master-ip-setup \
        tools/xen-console-wrapper
 
+nodist_tools_python_scripts = \
+       tools/node-cleanup
+
 nodist_tools_SCRIPTS = \
+       $(nodist_tools_python_scripts) \
        tools/vcluster-setup
 
 pkglib_python_scripts = \
@@ -727,6 +735,7 @@ pkglib_python_scripts = \
 
 nodist_pkglib_python_scripts = \
        tools/ensure-dirs \
+       tools/node-daemon-setup \
        tools/prepare-node-join
 
 myexeclib_SCRIPTS = \
@@ -970,6 +979,7 @@ python_tests = \
        test/ganeti.ssh_unittest.py \
        test/ganeti.storage_unittest.py \
        test/ganeti.tools.ensure_dirs_unittest.py \
+       test/ganeti.tools.node_daemon_setup_unittest.py \
        test/ganeti.tools.prepare_node_join_unittest.py \
        test/ganeti.uidpool_unittest.py \
        test/ganeti.utils.algo_unittest.py \
@@ -1030,6 +1040,7 @@ all_python_code = \
        $(python_scripts) \
        $(pkglib_python_scripts) \
        $(nodist_pkglib_python_scripts) \
+       $(nodist_tools_python_scripts) \
        $(python_tests) \
        $(pkgpython_PYTHON) \
        $(client_PYTHON) \
@@ -1373,7 +1384,9 @@ daemons/ganeti-%: MODULE = ganeti.server.$(patsubst ganeti-%,%,$(notdir $@))
 daemons/ganeti-watcher: MODULE = ganeti.watcher
 scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
 tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
+tools/node-daemon-setup: MODULE = ganeti.tools.node_daemon_setup
 tools/prepare-node-join: MODULE = ganeti.tools.prepare_node_join
+tools/node-cleanup: MODULE = ganeti.tools.node_cleanup
 $(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst htest/%,%,$@)
 
 $(PYTHON_BOOTSTRAP): Makefile | stamp-directories
@@ -1631,6 +1644,7 @@ endif
 
 .PHONY: py-apidoc
 py-apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(GENERATED_FILES)
+       env - PATH="$$PATH" PYTHONPATH="$$PYTHONPATH" \
        $(RUN_IN_TEMPDIR) epydoc -v \
          --conf $(CURDIR)/epydoc.conf \
          --output $(CURDIR)/$(APIDOC_PY_DIR)