Revision 25cdf177

b/.gitignore
102 102

  
103 103
/htools/htools
104 104
/htools/hconfd
105
/htools/htools-hpc
105 106
/htools/test
106 107
/htools/*.prof*
107 108
/htools/*.stat
108 109
/htools/*.tix
109 110
/.hpc/
111
/*.tix
110 112

  
111 113
/htools/Ganeti/HTools/Version.hs
112 114
/htools/Ganeti/Constants.hs
b/Makefile.am
354 354
HS_PROGS = htools/htools htools/hconfd
355 355
HS_BIN_ROLES = hbal hscan hspace hinfo
356 356

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

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

  
541 544
# test dependency
542
htools/offline-tests.sh: htools/htools
545
htools/offline-tests.sh: htools/htools-hpc
543 546

  
544 547
# rules for building profiling-enabled versions of the haskell
545 548
# programs: hs-prof does the full two-step build, whereas
......
1217 1220
	done
1218 1221

  
1219 1222
.PHONY: hs-check
1220
hs-check: htools/test htools/htools
1223
hs-check: htools/test htools/htools-hpc
1221 1224
	@rm -f test.tix
1222 1225
	./htools/test
1223
	HBINARY="./htools/htools" ./htools/offline-test.sh
1226
	HBINARY="./htools/htools-hpc" ./htools/offline-test.sh
1224 1227

  
1225 1228
# E111: indentation is not a multiple of four
1226 1229
# E261: at least two spaces before inline comment
......
1385 1388
	$(python_tests)
1386 1389

  
1387 1390
.PHONY: hs-coverage
1388
hs-coverage: $(haskell_tests)
1389
	cd htools && rm -f *.tix *.mix && ./test
1391
hs-coverage: $(haskell_tests) htools/htools-hpc
1392
	rm -f *.tix && $(MAKE) hs-check
1390 1393
	@mkdir_p@ $(COVERAGE_HS_DIR)
1391
	hpc markup --destdir=$(COVERAGE_HS_DIR) htools/test $(HPCEXCL)
1392
	hpc report htools/test $(HPCEXCL)
1394
	hpc combine $(HPCEXCL) test.tix htools-hpc.tix > htools-coverage.tix
1395
	hpc markup --destdir=$(COVERAGE_HS_DIR) htools-coverage.tix
1396
	hpc report htools-coverage.tix
1393 1397
	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
1394 1398

  
1395 1399
# 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 test offline-test.sh cli-tests-defs.sh; do
15
for htest in htools htools-hpc 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}
22
HBINARY=${HBINARY:-./htools/htools-hpc}
23 23

  
24 24
hbal() {
25 25
  HTOOLS=hbal $HBINARY "$@"
b/htools/htools-hpc.hs
1
htools.hs

Also available in: Unified diff