Revision cefd4a4a Makefile.am

b/Makefile.am
413 413
HS_ALL_PROGS = \
414 414
	$(HS_PROGS) \
415 415
	htest/hpc-htools \
416
	htest/hpc-mon-collector \
416 417
	htest/test \
417 418
	htools/hconfd \
418 419
	htools/rpc-test
......
678 679
# we compile the hpc-htools binary with the program coverage
679 680
htest/hpc-htools: HEXTRA_INT=-fhpc
680 681

  
682
# we compile the hpc-mon-collector binary with the program coverage
683
htest/hpc-mon-collector: HEXTRA_INT=-fhpc
684

  
681 685
# test dependency
682
htest/offline-tests.sh: htest/hpc-htools
686
htest/offline-tests.sh: htest/hpc-htools htest/hpc-mon-collector
683 687

  
684 688
# rules for building profiling-enabled versions of the haskell
685 689
# programs: hs-prof does the full two-step build, whereas
......
872 876
	htest/shelltests/htools-rapi.test \
873 877
	htest/shelltests/htools-single-group.test \
874 878
	htest/shelltests/htools-text-backend.test \
879
	htest/shelltests/htools-mon-collector.test \
875 880
	test/data/bdev-drbd-8.0.txt \
876 881
	test/data/bdev-drbd-8.3.txt \
877 882
	test/data/bdev-drbd-disk.txt \
......
1027 1032
if WANT_HTOOLSTESTS
1028 1033
nodist_TESTS += $(haskell_tests)
1029 1034
dist_TESTS += htest/offline-test.sh
1030
check_SCRIPTS += htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
1035
check_SCRIPTS += \
1036
	htest/hpc-htools \
1037
	htest/hpc-mon-collector \
1038
	$(HS_BUILT_TEST_HELPERS)
1031 1039
endif
1032 1040

  
1033 1041
TESTS = $(dist_TESTS) $(nodist_TESTS)
......
1509 1517
	test -z "$$error"
1510 1518

  
1511 1519
.PHONY: hs-check
1512
hs-check: htest/test htest/hpc-htools $(HS_BUILT_TEST_HELPERS)
1520
hs-check: htest/test htest/hpc-htools htest/hpc-mon-collector $(HS_BUILT_TEST_HELPERS)
1513 1521
	@rm -f test.tix
1514 1522
	./htest/test
1515 1523
	HBINARY="./htest/hpc-htools" ./htest/offline-test.sh
......
1726 1734
	$(python_tests)
1727 1735

  
1728 1736
.PHONY: hs-coverage
1729
hs-coverage: $(haskell_tests) htest/hpc-htools
1737
hs-coverage: $(haskell_tests) htest/hpc-htools htest/hpc-mon-collector
1730 1738
	rm -f *.tix
1731 1739
	$(MAKE) $(AM_MAKEFLAGS) hs-check
1732 1740
	@mkdir_p@ $(COVERAGE_HS_DIR)
1733 1741
	hpc combine --union $(HPCEXCL) \
1734
	  test.tix hpc-htools.tix > coverage-htools.tix
1742
	  test.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
1735 1743
	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
1736 1744
	hpc report coverage-htools.tix
1737 1745
	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html

Also available in: Unified diff