Revision 896b2850

b/.gitignore
102 102

  
103 103
/htools/htools
104 104
/htools/hconfd
105
/htools/htools-hpc
105
/htools/hpc-htools
106 106
/htools/test
107 107
/htools/*.prof*
108 108
/htools/*.stat
b/Makefile.am
356 356
HS_PROGS = htools/htools htools/hconfd
357 357
HS_BIN_ROLES = hbal hscan hspace hinfo
358 358

  
359
HS_ALL_PROGS = $(HS_PROGS) htools/test htools/htools-hpc
359
HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools
360 360
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
361 361
# we don't add -Werror by default
362 362
HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
......
540 540
	-fno-warn-monomorphism-restriction -fno-warn-orphans \
541 541
	-fno-warn-missing-methods -fno-warn-unused-imports
542 542

  
543
# we compile the htools-hpc binary with the program coverage
544
htools/htools-hpc: HEXTRA_INT=-fhpc
543
# we compile the hpc-htools binary with the program coverage
544
htools/hpc-htools: HEXTRA_INT=-fhpc
545 545

  
546 546
# test dependency
547
htools/offline-tests.sh: htools/htools-hpc
547
htools/offline-tests.sh: htools/hpc-htools
548 548

  
549 549
# rules for building profiling-enabled versions of the haskell
550 550
# programs: hs-prof does the full two-step build, whereas
......
839 839
if WANT_HTOOLSTESTS
840 840
nodist_TESTS += $(haskell_tests)
841 841
dist_TESTS += htools/offline-test.sh
842
check_SCRIPTS += htools/htools-hpc
842
check_SCRIPTS += htools/hpc-htools
843 843
endif
844 844

  
845 845
TESTS = $(dist_TESTS) $(nodist_TESTS)
......
1236 1236
	done
1237 1237

  
1238 1238
.PHONY: hs-check
1239
hs-check: htools/test htools/htools-hpc
1239
hs-check: htools/test htools/hpc-htools
1240 1240
	@rm -f test.tix
1241 1241
	./htools/test
1242
	HBINARY="./htools/htools-hpc" ./htools/offline-test.sh
1242
	HBINARY="./htools/hpc-htools" ./htools/offline-test.sh
1243 1243

  
1244 1244
# E111: indentation is not a multiple of four
1245 1245
# E261: at least two spaces before inline comment
......
1404 1404
	$(python_tests)
1405 1405

  
1406 1406
.PHONY: hs-coverage
1407
hs-coverage: $(haskell_tests) htools/htools-hpc
1407
hs-coverage: $(haskell_tests) htools/hpc-htools
1408 1408
	rm -f *.tix && $(MAKE) hs-check
1409 1409
	@mkdir_p@ $(COVERAGE_HS_DIR)
1410
	hpc combine $(HPCEXCL) test.tix htools-hpc.tix > htools-coverage.tix
1411
	hpc markup --destdir=$(COVERAGE_HS_DIR) htools-coverage.tix
1412
	hpc report htools-coverage.tix
1410
	hpc combine $(HPCEXCL) test.tix hpc-htools.tix > coverage-htools.tix
1411
	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
1412
	hpc report coverage-htools.tix
1413 1413
	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
1414 1414

  
1415 1415
# Special "kind-of-QA" target for htools, needs special setup (all
b/autotools/run-in-tempdir
12 12
mv $tmpdir/lib $tmpdir/ganeti
13 13
ln -T -s $tmpdir/ganeti $tmpdir/lib
14 14
mkdir -p $tmpdir/htools
15
for htest in htools htools-hpc test offline-test.sh cli-tests-defs.sh; do
15
for htest in htools hpc-htools test offline-test.sh cli-tests-defs.sh; do
16 16
  if [ -e htools/$htest ]; then
17 17
    cp -p htools/$htest $tmpdir/htools/
18 18
  fi
b/htools/cli-tests-defs.sh
19 19

  
20 20
# This is an shell testing configuration fragment.
21 21

  
22
HBINARY=${HBINARY:-./htools/htools-hpc}
22
HBINARY=${HBINARY:-./htools/hpc-htools}
23 23

  
24 24
TESTDATA_DIR=${TOP_SRCDIR:-.}/test/data/htools
25 25

  
b/htools/hpc-htools.hs
1
htools.hs
/dev/null
1
htools.hs

Also available in: Unified diff