stamp-srclinks \
$(nodist_pkgpython_PYTHON) \
$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
+ $(HS_BUILT_TEST_HELPERS) \
.hpc/*.mix htools/*.tix \
doc/hs-lint.html
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))
+HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail
+
# 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
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
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
$(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
$(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
$(PYTHON_BOOTSTRAP_SBIN) \
daemons/ganeti-cleaner
+if HS_CONFD
+nodist_sbin_SCRIPTS += htools/hconfd
+endif
+
python_scripts = \
tools/burnin \
tools/cfgshell \
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 \
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 = \
test/ganeti.asyncnotifier_unittest.py \
test/daemon-util_unittest.bash \
test/ganeti-cleaner_unittest.bash \
test/import-export_unittest.bash \
+ test/cli-test.bash \
$(python_tests)
nodist_TESTS =
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 = \
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) \
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
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; }
} > $@
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)
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
$(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