Revision 3e16567e Makefile.am

b/Makefile.am
417 417
	$(HS_PROGS) \
418 418
	test/hs/hpc-htools \
419 419
	test/hs/hpc-mon-collector \
420
	test/hs/test \
420
	test/hs/htest \
421 421
	src/hconfd \
422 422
	src/rpc-test
423 423

  
......
432 432

  
433 433
# extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
434 434
HEXTRA =
435
# internal extra flags (used for test/hs/test mainly)
435
# internal extra flags (used for test/hs/htest mainly)
436 436
HEXTRA_INT =
437 437
# exclude options for coverage reports
438 438
HPCEXCL = --exclude Main \
......
684 684
	  $(HEXTRA) $(HEXTRA_INT) $@
685 685
	@touch "$@"
686 686

  
687
# for the test/hs/test binary, we need to enable profiling/coverage
688
test/hs/test: HEXTRA_INT=-fhpc -itest/hs
687
# for the test/hs/htest binary, we need to enable profiling/coverage
688
test/hs/htest: HEXTRA_INT=-fhpc -itest/hs
689 689

  
690 690
# we compile the hpc-htools binary with the program coverage
691 691
test/hs/hpc-htools: HEXTRA_INT=-fhpc
......
1040 1040
	test/py/qa.qa_config_unittest.py \
1041 1041
	test/py/tempfile_fork_unittest.py
1042 1042

  
1043
haskell_tests = test/hs/test
1043
haskell_tests = test/hs/htest
1044 1044

  
1045 1045
dist_TESTS = \
1046 1046
	test/py/check-cert-expired_unittest.bash \
......
1552 1552
	test -z "$$error"
1553 1553

  
1554 1554
.PHONY: hs-check
1555
hs-check: test/hs/test test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS) \
1555
hs-check: test/hs/htest test/hs/hpc-htools test/hs/hpc-mon-collector $(HS_BUILT_TEST_HELPERS) \
1556 1556
	| $(BUILT_PYTHON_SOURCES)
1557 1557
	@rm -f *.tix
1558
	./test/hs/test
1558
	./test/hs/htest
1559 1559
	HBINARY="./test/hs/hpc-htools" ./test/hs/offline-test.sh
1560 1560

  
1561 1561
# E111: indentation is not a multiple of four
......
1773 1773
	$(MAKE) $(AM_MAKEFLAGS) hs-check
1774 1774
	@mkdir_p@ $(COVERAGE_HS_DIR)
1775 1775
	hpc sum --union $(HPCEXCL) \
1776
	  test.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
1776
	  htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
1777 1777
	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
1778 1778
	hpc report coverage-htools.tix
1779 1779
	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html

Also available in: Unified diff