X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/bdf51a05a16a16c8285b7e6d06b16911f4ccc403..2dcb5a26d90b3a52b78daf6917ded01b12647860:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7ff4cbc..568bdab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,9 @@ strip_hsroot = $(patsubst src/%,%,$(patsubst test/hs/%,%,$(1)))
 # Use bash in order to be able to use pipefail
 SHELL=/bin/bash
 
+# Enable colors in shelltest
+SHELLTESTARGS = "-c"
+
 ACLOCAL_AMFLAGS = -I autotools
 BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
 RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
@@ -83,6 +86,7 @@ HS_DIRS = \
 	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 \
@@ -541,6 +545,7 @@ HS_LIB_SRCS = \
 	src/Ganeti/Common.hs \
 	src/Ganeti/Compat.hs \
 	src/Ganeti/Confd/Client.hs \
+	src/Ganeti/Confd/ClientFunctions.hs \
 	src/Ganeti/Confd/Server.hs \
 	src/Ganeti/Confd/Types.hs \
 	src/Ganeti/Confd/Utils.hs \
@@ -552,6 +557,7 @@ HS_LIB_SRCS = \
 	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 \
@@ -659,6 +665,7 @@ HS_TEST_SRCS = \
 	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 \
@@ -1077,6 +1084,7 @@ TEST_FILES = \
 	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 \
@@ -1129,6 +1137,7 @@ TEST_FILES = \
 	test/data/cluster_config_2.7.json \
 	test/data/cluster_config_2.8.json \
 	test/data/instance-minor-pairing.txt \
+	test/data/instance-prim-sec.txt \
 	test/data/ip-addr-show-dummy0.txt \
 	test/data/ip-addr-show-lo-ipv4.txt \
 	test/data/ip-addr-show-lo-ipv6.txt \
@@ -1142,6 +1151,7 @@ TEST_FILES = \
 	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 \
@@ -1203,6 +1213,7 @@ python_tests = \
 	test/py/ganeti.asyncnotifier_unittest.py \
 	test/py/ganeti.backend_unittest-runasroot.py \
 	test/py/ganeti.backend_unittest.py \
+	test/py/ganeti.bootstrap_unittest.py \
 	test/py/ganeti.cli_unittest.py \
 	test/py/ganeti.client.gnt_cluster_unittest.py \
 	test/py/ganeti.client.gnt_instance_unittest.py \
@@ -1565,8 +1576,6 @@ lib/_autoconf.py: Makefile | stamp-directories
 	  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)'"; \
 	  echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
 	  echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
@@ -1666,7 +1675,6 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
 	  echo 's#@''CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
 	  echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
 	  echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
-	  echo 's#@''RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
 	  echo 's#@''RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
 	  echo 's#@''PKGLIBDIR@#$(pkglibdir)#g'; \
 	  echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
@@ -1820,15 +1828,30 @@ check-local: check-dirs $(GENERATED_FILES)
 	done; \
 	test -z "$$error"
 
+.PHONY: hs-test-%
+hs-test-%: test/hs/htest | $(BUILT_PYTHON_SOURCES)
+	@rm -f htest.tix
+	test/hs/htest -t $*
+
 .PHONY: hs-tests
 hs-tests: test/hs/htest | $(BUILT_PYTHON_SOURCES)
 	@rm -f htest.tix
 	./test/hs/htest
 
+.PHONY: hs-shell-%
+hs-shell-%: test/hs/hpc-htools test/hs/hpc-mon-collector \
+            $(HS_BUILT_TEST_HELPERS)
+	@rm -f hpc-htools.tix hpc-mon-collector.tix
+	HBINARY="./test/hs/hpc-htools" \
+	SHELLTESTARGS=$(SHELLTESTARGS) \
+	./test/hs/offline-test.sh $*
+
 .PHONY: hs-shell
 hs-shell: test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
 	@rm -f hpc-htools.tix hpc-mon-collector.tix
-	HBINARY="./test/hs/hpc-htools" ./test/hs/offline-test.sh
+	HBINARY="./test/hs/hpc-htools" \
+	SHELLTESTARGS=$(SHELLTESTARGS) \
+	./test/hs/offline-test.sh
 
 .PHONY: hs-check
 hs-check: hs-tests hs-shell