X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/91e5a35149f52d68cb2e3b4707a907749e617c71..43c16a8a1adfd543751fcaf60ad4c8e04cf83688:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0298f21..7a2d359 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,6 +156,7 @@ CLEANFILES = \
 	stamp-srclinks \
 	$(nodist_pkgpython_PYTHON) \
 	$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
+	$(HS_BUILT_TEST_HELPERS) \
 	.hpc/*.mix htools/*.tix \
 	doc/hs-lint.html
 
@@ -196,7 +197,8 @@ nodist_pkgpython_PYTHON = \
 
 noinst_PYTHON = \
 	lib/build/__init__.py \
-	lib/build/sphinx_ext.py
+	lib/build/sphinx_ext.py \
+	lib/build/shell_example_lexer.py
 
 pkgpython_PYTHON = \
 	lib/__init__.py \
@@ -353,14 +355,15 @@ docrst = \
 	doc/upgrade.rst \
 	doc/walkthrough.rst
 
-HS_PROGS = htools/htools htools/hconfd
+HS_PROGS = htools/htools
 HS_BIN_ROLES = hbal hscan hspace hinfo
 
-HS_ALL_PROGS = $(HS_PROGS) htools/test htools/htools-hpc
+HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools htools/hconfd
 HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
-# we don't add -Werror by default
-HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
-# extra flags that can be overriden on the command line
+HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail
+
+HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
+# extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
 HEXTRA =
 # internal extra flags (used for htools/test mainly)
 HEXTRA_INT =
@@ -411,6 +414,7 @@ HS_LIB_SRCS = \
 	htools/Ganeti/Objects.hs \
 	htools/Ganeti/OpCodes.hs \
 	htools/Ganeti/Runtime.hs \
+	htools/Ganeti/Ssconf.hs \
 	htools/Ganeti/THH.hs
 
 HS_BUILT_SRCS = htools/Ganeti/HTools/Version.hs htools/Ganeti/Constants.hs
@@ -424,7 +428,8 @@ $(RUN_IN_TEMPDIR): | $(all_dirfiles)
 # successfully, but we certainly don't want the docs to be rebuilt if
 # it changes
 doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
-	$(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py lib/opcodes.py lib/ht.py \
+	$(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+	lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \
 	| $(BUILT_PYTHON_SOURCES)
 	@test -n "$(SPHINX)" || \
 	    { echo 'sphinx-build' not found during configure; exit 1; }
@@ -478,18 +483,22 @@ gnt_scripts = \
 	scripts/gnt-os
 
 PYTHON_BOOTSTRAP_SBIN = \
-	daemons/ganeti-confd \
 	daemons/ganeti-masterd \
 	daemons/ganeti-noded \
 	daemons/ganeti-watcher \
 	daemons/ganeti-rapi \
 	$(gnt_scripts)
 
+if PY_CONFD
+PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
+endif
+
 PYTHON_BOOTSTRAP = \
 	$(PYTHON_BOOTSTRAP_SBIN) \
 	tools/ensure-dirs
 
 qa_scripts = \
+	qa/__init__.py \
 	qa/ganeti-qa.py \
 	qa/qa_cluster.py \
 	qa/qa_config.py \
@@ -498,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 \
@@ -516,6 +526,9 @@ install-exec-hook:
 		$(LN_S) -f htools \
 			   $(DESTDIR)$(bindir)/$$role ; \
 	done
+if HS_CONFD
+	mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
+endif
 endif
 
 $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
@@ -534,17 +547,16 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
 	  $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
 	  -osuf $$BINARY.o -hisuf $$BINARY.hi \
 	  $(HEXTRA) $(HEXTRA_INT) $@
-
 # for the htools/test binary, we need to enable profiling/coverage
 htools/test: HEXTRA_INT=-fhpc -Wwarn -fno-warn-missing-signatures \
 	-fno-warn-monomorphism-restriction -fno-warn-orphans \
 	-fno-warn-missing-methods -fno-warn-unused-imports
 
-# we compile the htools-hpc binary with the program coverage
-htools/htools-hpc: HEXTRA_INT=-fhpc
+# we compile the hpc-htools binary with the program coverage
+htools/hpc-htools: HEXTRA_INT=-fhpc
 
 # test dependency
-htools/offline-tests.sh: htools/htools-hpc
+htools/offline-tests.sh: htools/hpc-htools
 
 # rules for building profiling-enabled versions of the haskell
 # programs: hs-prof does the full two-step build, whereas
@@ -567,6 +579,10 @@ nodist_sbin_SCRIPTS = \
 	$(PYTHON_BOOTSTRAP_SBIN) \
 	daemons/ganeti-cleaner
 
+if HS_CONFD
+nodist_sbin_SCRIPTS += htools/hconfd
+endif
+
 python_scripts = \
 	tools/burnin \
 	tools/cfgshell \
@@ -621,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 \
@@ -714,6 +731,7 @@ TEST_FILES = \
 	test/data/sys_drbd_usermode_helper.txt \
 	test/data/htools/hail-alloc-drbd.json \
 	test/data/htools/hail-change-group.json \
+	test/data/htools/hail-invalid-reloc.json \
 	test/data/htools/hail-node-evac.json \
 	test/data/htools/hail-reloc-drbd.json \
 	test/data/htools/common-suffix.data \
@@ -753,9 +771,24 @@ TEST_FILES = \
 	test/data/vgreduce-removemissing-2.02.66-ok.txt \
 	test/data/vgs-missing-pvs-2.02.02.txt \
 	test/data/vgs-missing-pvs-2.02.66.txt \
-	test/import-export_unittest-helper
+	test/import-export_unittest-helper \
+	test/gnt-cli.test \
+	test/ganeti-cli.test \
+	test/htools-balancing.test \
+	test/htools-basic.test \
+	test/htools-dynutil.test \
+	test/htools-excl.test \
+	test/htools-hail.test \
+	test/htools-hspace.test \
+	test/htools-invalid.test \
+	test/htools-multi-group.test \
+	test/htools-no-backend.test \
+	test/htools-rapi.test \
+	test/htools-single-group.test \
+	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 \
@@ -816,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 \
@@ -831,6 +865,7 @@ dist_TESTS = \
 	test/daemon-util_unittest.bash \
 	test/ganeti-cleaner_unittest.bash \
 	test/import-export_unittest.bash \
+	test/cli-test.bash \
 	$(python_tests)
 
 nodist_TESTS =
@@ -839,15 +874,17 @@ check_SCRIPTS =
 if WANT_HTOOLSTESTS
 nodist_TESTS += $(haskell_tests)
 dist_TESTS += htools/offline-test.sh
-check_SCRIPTS += htools/htools-hpc
+check_SCRIPTS += htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
 endif
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 # Environment for all tests
 PLAIN_TESTS_ENVIRONMENT = \
-	PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) PYTHON=$(PYTHON) \
-	FAKEROOT=$(FAKEROOT_PATH) $(RUN_IN_TEMPDIR)
+	PYTHONPATH=. \
+	TOP_SRCDIR=$(abs_top_srcdir) TOP_BUILDDIR=$(abs_top_builddir) \
+	PYTHON=$(PYTHON) FAKEROOT=$(FAKEROOT_PATH) \
+	$(RUN_IN_TEMPDIR)
 
 # Environment for tests run by automake
 TESTS_ENVIRONMENT = \
@@ -880,6 +917,7 @@ srclink_files = \
 	test/daemon-util_unittest.bash \
 	test/ganeti-cleaner_unittest.bash \
 	test/import-export_unittest.bash \
+	test/cli-test.bash \
 	htools/offline-test.sh \
 	htools/cli-tests-defs.sh \
 	$(all_python_code) \
@@ -960,7 +998,13 @@ man/footer.html: man/footer.rst
 	  { echo 'pandoc' not found during configure; exit 1; }
 	$(PANDOC) -f rst -t html -o $@ $<
 
-man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py
+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
@@ -1019,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); } > $@
@@ -1055,6 +1100,7 @@ lib/_autoconf.py: Makefile | lib/.dir
 	  echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
 	  echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
 	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
+	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
 	  echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
 	  echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
 	  echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
@@ -1090,6 +1136,8 @@ lib/_autoconf.py: Makefile | lib/.dir
 	    echo "HTOOLS = False"; \
 	  fi; \
 	  echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
+	  echo "PY_CONFD = $(PY_CONFD)"; \
+	  echo "HS_CONFD = $(HS_CONFD)"; \
 	} > $@
 
 lib/_vcsversion.py: Makefile vcs-version | lib/.dir
@@ -1149,6 +1197,7 @@ 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
+$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/%,%,$@)
 
 $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
 	test -n "$(MODULE)" || { echo Missing module; exit 1; }
@@ -1177,6 +1226,17 @@ $(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
 	} > $@
 	chmod u+x $@
 
+$(HS_BUILT_TEST_HELPERS): Makefile
+	@test -n "$(TESTROLE)" || { echo Missing TESTROLE; exit 1; }
+	set -e; \
+	{ echo '#!/bin/sh'; \
+	  echo '# This file is automatically generated, do not edit!'; \
+	  echo "# Edit Makefile.am instead."; \
+	  echo; \
+	  echo "HTOOLS=$(TESTROLE) exec ./htools/hpc-htools \"\$$@\""; \
+	} > $@
+	chmod u+x $@
+
 # We need to create symlinks because "make distcheck" will not install Python
 # files when building.
 stamp-srclinks: Makefile | $(all_dirfiles)
@@ -1236,10 +1296,10 @@ check-local: check-dirs $(BUILT_SOURCES)
 	done
 
 .PHONY: hs-check
-hs-check: htools/test htools/htools-hpc
+hs-check: htools/test htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
 	@rm -f test.tix
 	./htools/test
-	HBINARY="./htools/htools-hpc" ./htools/offline-test.sh
+	HBINARY="./htools/hpc-htools" ./htools/offline-test.sh
 
 # E111: indentation is not a multiple of four
 # E261: at least two spaces before inline comment
@@ -1404,12 +1464,12 @@ py-coverage: $(BUILT_SOURCES) $(python_tests)
 	$(python_tests)
 
 .PHONY: hs-coverage
-hs-coverage: $(haskell_tests) htools/htools-hpc
+hs-coverage: $(haskell_tests) htools/hpc-htools
 	rm -f *.tix && $(MAKE) hs-check
 	@mkdir_p@ $(COVERAGE_HS_DIR)
-	hpc combine $(HPCEXCL) test.tix htools-hpc.tix > htools-coverage.tix
-	hpc markup --destdir=$(COVERAGE_HS_DIR) htools-coverage.tix
-	hpc report htools-coverage.tix
+	hpc combine $(HPCEXCL) test.tix hpc-htools.tix > coverage-htools.tix
+	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
+	hpc report coverage-htools.tix
 	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all