HS_DIRS = \
src \
src/Ganeti \
- src/Ganeti/Block \
- src/Ganeti/Block/Drbd \
src/Ganeti/Confd \
src/Ganeti/Curl \
src/Ganeti/DataCollectors \
src/Ganeti/Hypervisor/Xen \
src/Ganeti/Monitoring \
src/Ganeti/Query \
+ src/Ganeti/Storage \
+ src/Ganeti/Storage/Diskstats \
+ src/Ganeti/Storage/Drbd \
+ src/Ganeti/Storage/Lvm \
test/hs \
test/hs/Test \
test/hs/Test/Ganeti \
- test/hs/Test/Ganeti/Block \
- test/hs/Test/Ganeti/Block/Drbd \
+ test/hs/Test/Ganeti/Storage \
+ test/hs/Test/Ganeti/Storage/Diskstats \
+ test/hs/Test/Ganeti/Storage/Drbd \
+ test/hs/Test/Ganeti/Storage/Lvm \
test/hs/Test/Ganeti/Confd \
test/hs/Test/Ganeti/HTools \
test/hs/Test/Ganeti/HTools/Backend \
test/data/htools \
test/data/htools/rapi \
test/hs/shelltests \
+ test/autotools \
lib \
lib/build \
lib/client \
$(man_MANS) \
$(manhtml) \
tools/kvm-ifup \
+ tools/vif-ganeti \
+ tools/net-common \
tools/users-setup \
tools/vcluster-setup \
stamp-directories \
doc/design-2.5.rst \
doc/design-2.6.rst \
doc/design-2.7.rst \
+ doc/design-2.8.rst \
doc/design-autorepair.rst \
doc/design-bulk-create.rst \
doc/design-chained-jobs.rst \
$(patsubst src.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
HS_LIB_SRCS = \
- src/Ganeti/Block/Drbd/Types.hs \
- src/Ganeti/Block/Drbd/Parser.hs \
src/Ganeti/BasicTypes.hs \
src/Ganeti/Common.hs \
src/Ganeti/Compat.hs \
src/Ganeti/Curl/Multi.hs \
src/Ganeti/Daemon.hs \
src/Ganeti/DataCollectors/CLI.hs \
+ src/Ganeti/DataCollectors/Diskstats.hs \
src/Ganeti/DataCollectors/Drbd.hs \
src/Ganeti/DataCollectors/InstStatus.hs \
src/Ganeti/DataCollectors/InstStatusTypes.hs \
+ src/Ganeti/DataCollectors/Lv.hs \
src/Ganeti/DataCollectors/Program.hs \
src/Ganeti/DataCollectors/Types.hs \
src/Ganeti/Errors.hs \
src/Ganeti/HTools/Group.hs \
src/Ganeti/HTools/Instance.hs \
src/Ganeti/HTools/Loader.hs \
+ src/Ganeti/HTools/Nic.hs \
src/Ganeti/HTools/Node.hs \
src/Ganeti/HTools/PeerMap.hs \
src/Ganeti/HTools/Program/Hail.hs \
src/Ganeti/OpCodes.hs \
src/Ganeti/OpParams.hs \
src/Ganeti/Path.hs \
+ src/Ganeti/Query/Cluster.hs \
src/Ganeti/Query/Common.hs \
src/Ganeti/Query/Export.hs \
src/Ganeti/Query/Filter.hs \
src/Ganeti/Rpc.hs \
src/Ganeti/Runtime.hs \
src/Ganeti/Ssconf.hs \
+ src/Ganeti/Storage/Diskstats/Parser.hs \
+ src/Ganeti/Storage/Diskstats/Types.hs \
+ src/Ganeti/Storage/Drbd/Parser.hs \
+ src/Ganeti/Storage/Drbd/Types.hs \
+ src/Ganeti/Storage/Lvm/LVParser.hs \
+ src/Ganeti/Storage/Lvm/Types.hs \
+ src/Ganeti/Storage/Utils.hs \
src/Ganeti/THH.hs \
src/Ganeti/Types.hs \
src/Ganeti/Utils.hs
HS_TEST_SRCS = \
test/hs/Test/Ganeti/Attoparsec.hs \
test/hs/Test/Ganeti/BasicTypes.hs \
- test/hs/Test/Ganeti/Block/Drbd/Parser.hs \
- test/hs/Test/Ganeti/Block/Drbd/Types.hs \
test/hs/Test/Ganeti/Common.hs \
test/hs/Test/Ganeti/Confd/Types.hs \
test/hs/Test/Ganeti/Confd/Utils.hs \
test/hs/Test/Ganeti/Rpc.hs \
test/hs/Test/Ganeti/Runtime.hs \
test/hs/Test/Ganeti/Ssconf.hs \
+ test/hs/Test/Ganeti/Storage/Diskstats/Parser.hs \
+ test/hs/Test/Ganeti/Storage/Drbd/Parser.hs \
+ test/hs/Test/Ganeti/Storage/Drbd/Types.hs \
+ test/hs/Test/Ganeti/Storage/Lvm/LVParser.hs \
test/hs/Test/Ganeti/THH.hs \
test/hs/Test/Ganeti/TestCommon.hs \
test/hs/Test/Ganeti/TestHTools.hs \
test/hs/hpc-mon-collector: HEXTRA_INT=-fhpc
# test dependency
-test/hs/offline-tests.sh: test/hs/hpc-htools test/hs/hpc-mon-collector
+test/hs/offline-test.sh: test/hs/hpc-htools test/hs/hpc-mon-collector
# rules for building profiling-enabled versions of the haskell
# programs: hs-prof does the full two-step build, whereas
myexeclib_SCRIPTS = \
daemons/daemon-util \
tools/kvm-ifup \
+ tools/vif-ganeti \
+ tools/net-common \
$(pkglib_python_scripts) \
$(HS_MYEXECLIB_PROGS)
devel/upload \
devel/webserver \
tools/kvm-ifup.in \
+ tools/vif-ganeti.in \
+ tools/net-common.in \
tools/users-setup.in \
tools/vcluster-setup.in \
$(docinput) \
man/gnt-os.8 \
man/gnt-storage.8 \
man/hail.1 \
+ man/harep.1 \
man/hbal.1 \
man/hcheck.1 \
man/hinfo.1 \
$(mangen)
TEST_FILES = \
+ test/autotools/autotools-check-news.test \
test/data/htools/clean-nonzero-score.data \
test/data/htools/common-suffix.data \
test/data/htools/empty-cluster.data \
test/data/htools/hail-alloc-drbd.json \
+ test/data/htools/hail-alloc-invalid-network.json \
test/data/htools/hail-alloc-invalid-twodisks.json \
+ test/data/htools/hail-alloc-restricted-network.json \
+ test/data/htools/hail-alloc-spindles.json \
test/data/htools/hail-alloc-twodisks.json \
test/data/htools/hail-change-group.json \
test/data/htools/hail-invalid-reloc.json \
test/data/htools/hail-reloc-drbd.json \
test/data/htools/hbal-excl-tags.data \
test/data/htools/hbal-split-insts.data \
+ test/data/htools/hspace-tiered-dualspec-exclusive.data \
test/data/htools/hspace-tiered-dualspec.data \
+ test/data/htools/hspace-tiered-exclusive.data \
+ test/data/htools/hspace-tiered-ipolicy.data \
+ test/data/htools/hspace-tiered-mixed.data \
+ test/data/htools/hspace-tiered-resourcetypes.data \
+ test/data/htools/hspace-tiered-vcpu.data \
test/data/htools/hspace-tiered.data \
test/data/htools/invalid-node.data \
test/data/htools/missing-resources.data \
test/data/htools/rapi/info.json \
test/data/htools/rapi/instances.json \
test/data/htools/rapi/nodes.json \
+ test/data/htools/hroller-full.data \
+ test/data/htools/hroller-nodegroups.data \
test/data/htools/hroller-nonredundant.data \
test/data/htools/hroller-online.data \
test/data/htools/unique-reboot-order.data \
test/data/kvm_0.9.1_help_boot_test.txt \
test/data/kvm_1.0_help.txt \
test/data/kvm_1.1.2_help.txt \
+ test/data/lvs_lv.txt \
+ test/data/NEWS_OK.txt \
+ test/data/NEWS_previous_unreleased.txt \
test/data/ovfdata/compr_disk.vmdk.gz \
test/data/ovfdata/config.ini \
test/data/ovfdata/corrupted_resources.ovf \
test/data/ovfdata/wrong_manifest.ovf \
test/data/ovfdata/wrong_ova.ova \
test/data/ovfdata/wrong_xml.ovf \
+ test/data/proc_diskstats.txt \
test/data/proc_drbd8.txt \
test/data/proc_drbd80-emptyline.txt \
test/data/proc_drbd80-emptyversion.txt \
test/py/gnt-cli.test \
test/py/import-export_unittest-helper
+
python_tests = \
doc/examples/rapi_testutils.py \
test/py/cfgupgrade_unittest.py \
test/py/ganeti.utils.nodesetup_unittest.py \
test/py/ganeti.utils.process_unittest.py \
test/py/ganeti.utils.retry_unittest.py \
+ test/py/ganeti.utils.storage_unittest.py \
test/py/ganeti.utils.text_unittest.py \
test/py/ganeti.utils.wrapper_unittest.py \
test/py/ganeti.utils.x509_unittest.py \
test/py/ganeti-cleaner_unittest.bash \
test/py/import-export_unittest.bash \
test/py/cli-test.bash \
- test/py/bash_completion.bash \
- $(python_tests)
+ test/py/bash_completion.bash
+
+if !PY_NODEV
+ dist_TESTS += $(python_tests)
+endif
nodist_TESTS =
check_SCRIPTS =
$(pkglib_python_scripts) \
$(nodist_pkglib_python_scripts) \
$(nodist_tools_python_scripts) \
- $(python_tests) \
$(pkgpython_PYTHON) \
$(client_PYTHON) \
$(cmdlib_PYTHON) \
$(noinst_PYTHON) \
$(qa_scripts)
+if !PY_NODEV
+ all_python_code += $(python_tests)
+endif
+
srclink_files = \
man/footer.rst \
test/py/check-cert-expired_unittest.bash \
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
+tools/vif-ganeti: tools/vif-ganeti.in $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
+ chmod +x $@
+
+tools/net-common: tools/net-common.in $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
+ chmod +x $@
+
tools/users-setup: tools/users-setup.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
RELEASE=$(PACKAGE_VERSION) $(CHECK_NEWS) < $(top_srcdir)/NEWS
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
- @expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
error= ; \
- if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
- echo "Incorrect version in README, expected $$expver" >&2; \
- error=1; \
- fi; \
- for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \
- doc/security.rst; do \
- if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
- "Documents Ganeti version $$expver"; then \
- echo "Incorrect version in $$file, expected $$expver" >&2; \
+ if [ "x`echo $(VERSION_SUFFIX)|grep 'alpha'`" == "x" ]; then \
+ expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
+ if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
+ echo "Incorrect version in README, expected $$expver" >&2; \
+ error=1; \
+ fi; \
+ for file in doc/iallocator.rst doc/hooks.rst doc/virtual-cluster.rst \
+ doc/security.rst; do \
+ if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
+ "Documents Ganeti version $$expver"; then \
+ echo "Incorrect version in $$file, expected $$expver" >&2; \
+ error=1; \
+ fi; \
+ done; \
+ if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
+ echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \
+ error=1; \
+ fi; \
+ if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \
+ ".. Last updated for Ganeti $$expver"; then \
+ echo "doc/design-draft.rst was not updated for version $$expver" >&2; \
error=1; \
fi; \
- done; \
- if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
- echo "File $(top_srcdir)/doc/design-$$expver.rst not found" >&2; \
- error=1; \
- fi; \
- if test "`sed -ne '5 p' $(top_srcdir)/doc/design-draft.rst`" != \
- ".. Last updated for Ganeti $$expver"; then \
- echo "doc/design-draft.rst was not updated for version $$expver" >&2; \
- error=1; \
fi; \
for file in configure.ac $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS); do \
if test $$(wc --max-line-length < $(top_srcdir)/$$file) -gt 80; then \
etags -l python -a -
.PHONY: coverage
+
+COVERAGE_TESTS=
if WANT_HTOOLS
-coverage: py-coverage hs-coverage
-else
-coverage: py-coverage
+COVERAGE_TESTS += hs-coverage
endif
+if !PY_NODEV
+COVERAGE_TESTS += py-coverage
+endif
+
+coverage: $(COVERAGE_TESTS)
.PHONY: py-coverage
py-coverage: $(GENERATED_FILES) $(python_tests)
--srcdir=.. $(HPCEXCL) ; \
hpc report --srcdir=.. live-test $(HPCEXCL)
-commit-check: distcheck lint apidoc
+commit-check: autotools-check distcheck lint apidoc
+
+autotools-check:
+ TESTDATA_DIR=./test/data shelltest $(SHELLTESTARGS) \
+ $(abs_top_srcdir)/test/autotools/*-*.test \
+ -- --hide-successes
.PHONY: gitignore-check
gitignore-check:
projects / ganeti-local / blobdiff