Add more mon-collector shell tests

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 601da2b..713abd8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -455,6 +455,7 @@ HS_LIB_SRCS = \
        htools/Ganeti/Confd/Utils.hs \
        htools/Ganeti/Config.hs \
        htools/Ganeti/Daemon.hs \
+       htools/Ganeti/DataCollectors/CLI.hs \
        htools/Ganeti/DataCollectors/Drbd.hs \
        htools/Ganeti/DataCollectors/Program.hs \
        htools/Ganeti/Errors.hs \
@@ -512,6 +513,7 @@ HS_TEST_SRCS = \
        htest/Test/Ganeti/Block/Drbd/Parser.hs \
        htest/Test/Ganeti/Block/Drbd/Types.hs \
        htest/Test/Ganeti/Common.hs \
+       htest/Test/Ganeti/Confd/Types.hs \
        htest/Test/Ganeti/Confd/Utils.hs \
        htest/Test/Ganeti/Daemon.hs \
        htest/Test/Ganeti/Errors.hs \
@@ -691,13 +693,21 @@ htest/offline-tests.sh: htest/hpc-htools htest/hpc-mon-collector
 # run before)
 .PHONY: hs-prof hs-prof-quick
 hs-prof:
+       @if [ -z "$(TARGET)" ]; then \
+         echo "You need to define TARGET when running this rule" 1>&2; \
+         exit 1; \
+       fi
        $(MAKE) $(AM_MAKEFLAGS) clean
-       $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf o"
+       $(MAKE) $(AM_MAKEFLAGS) $(TARGET) HEXTRA="-osuf o"
        rm -f $(HS_ALL_PROGS)
        $(MAKE) $(AM_MAKEFLAGS) hs-prof-quick
 
 hs-prof-quick:
-       $(MAKE) $(AM_MAKEFLAGS) $(HS_ALL_PROGS) HEXTRA="-osuf prof_o -prof -auto-all"
+       @if [ -z "$(TARGET)" ]; then \
+         echo "You need to define TARGET when running this rule" 1>&2; \
+         exit 1; \
+       fi
+       $(MAKE) $(AM_MAKEFLAGS) $(TARGET) HEXTRA="-osuf prof_o -prof -auto-all"
 
 dist_sbin_SCRIPTS = \
        tools/ganeti-listrunner
@@ -1321,6 +1331,7 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "XEN_CMD = '$(XEN_CMD)'"; \
          echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
          echo "ENABLE_RESTRICTED_COMMANDS = $(ENABLE_RESTRICTED_COMMANDS)"; \
+         echo "ENABLE_MONITORING = $(ENABLE_MONITORING)"; \
        } > $@
 
 lib/_vcsversion.py: Makefile vcs-version | stamp-directories
@@ -1524,7 +1535,7 @@ check-local: check-dirs $(GENERATED_FILES)
 
 .PHONY: hs-check
 hs-check: htest/test htest/hpc-htools htest/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
-       @rm -f test.tix
+       @rm -f *.tix
        ./htest/test
        HBINARY="./htest/hpc-htools" ./htest/offline-test.sh