Improve the reception of replies in the confd client

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b42654..77e5c33 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -478,7 +478,6 @@ HS_LIB_SRCS = \
        src/Ganeti/HTools/Loader.hs \
        src/Ganeti/HTools/Node.hs \
        src/Ganeti/HTools/PeerMap.hs \
-       src/Ganeti/HTools/Program.hs \
        src/Ganeti/HTools/Program/Hail.hs \
        src/Ganeti/HTools/Program/Hbal.hs \
        src/Ganeti/HTools/Program/Hcheck.hs \
@@ -486,6 +485,7 @@ HS_LIB_SRCS = \
        src/Ganeti/HTools/Program/Hscan.hs \
        src/Ganeti/HTools/Program/Hspace.hs \
        src/Ganeti/HTools/Program/Hroller.hs \
+       src/Ganeti/HTools/Program/Main.hs \
        src/Ganeti/HTools/Types.hs \
        src/Ganeti/Hash.hs \
        src/Ganeti/JQueue.hs \
@@ -793,7 +793,7 @@ EXTRA_DIST = \
        autotools/check-version \
        autotools/convert-constants \
        autotools/docpp \
-       autotools/gen-coverage \
+       autotools/gen-py-coverage \
        autotools/testrunner \
        autotools/wrong-hardcoded-paths \
        $(RUN_IN_TEMPDIR) \
@@ -1551,13 +1551,19 @@ check-local: check-dirs $(GENERATED_FILES)
        done; \
        test -z "$$error"
 
-.PHONY: hs-check
-hs-check: test/hs/htest test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS) \
-       | $(BUILT_PYTHON_SOURCES)
-       @rm -f *.tix
+.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" ./test/hs/offline-test.sh
 
+.PHONY: hs-check
+hs-check: hs-tests hs-shell
+
 # E111: indentation is not a multiple of four
 # E121: continuation line indentation is not a multiple of four
 #       (since our indent level is not 4)
@@ -1764,7 +1770,8 @@ py-coverage: $(GENERATED_FILES) $(python_tests)
        COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \
        TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \
        HTML_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR) \
-       $(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/gen-coverage \
+       $(PLAIN_TESTS_ENVIRONMENT) \
+       $(abs_top_srcdir)/autotools/gen-py-coverage \
        $(python_tests)
 
 .PHONY: hs-coverage
@@ -1773,9 +1780,9 @@ hs-coverage: $(haskell_tests) test/hs/hpc-htools test/hs/hpc-mon-collector
        $(MAKE) $(AM_MAKEFLAGS) hs-check
        @mkdir_p@ $(COVERAGE_HS_DIR)
        hpc sum --union $(HPCEXCL) \
-         htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
-       hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
-       hpc report coverage-htools.tix
+         htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-hs.tix
+       hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-hs.tix
+       hpc report coverage-hs.tix
        $(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
 
 # Special "kind-of-QA" target for htools, needs special setup (all