Revision 04d15e63 Makefile.am

b/Makefile.am
538 538
	-fno-warn-monomorphism-restriction -fno-warn-orphans \
539 539
	-fno-warn-missing-methods -fno-warn-unused-imports
540 540

  
541
# test dependency
542
htools/offline-tests.sh: htools/htools
543

  
541 544
# rules for building profiling-enabled versions of the haskell
542 545
# programs: hs-prof does the full two-step build, whereas
543 546
# hs-prof-quick does only the final rebuild (hs-prof must have been
......
643 646
	$(qa_scripts) \
644 647
	$(HS_LIB_SRCS) $(HS_BUILT_SRCS_IN) \
645 648
	$(HS_PROG_SRCS) \
646
	htools/lint-hints.hs
649
	htools/lint-hints.hs \
650
	htools/cli-tests-defs.sh \
651
	htools/offline-test.sh
647 652

  
648 653
man_MANS = \
649 654
	man/ganeti.7 \
......
815 820
nodist_TESTS =
816 821
if WANT_HTOOLSTESTS
817 822
nodist_TESTS += $(haskell_tests)
823
dist_TESTS += htools/offline-test.sh
818 824
endif
819 825

  
820 826
TESTS = $(dist_TESTS) $(nodist_TESTS)
......
855 861
	test/daemon-util_unittest.bash \
856 862
	test/ganeti-cleaner_unittest.bash \
857 863
	test/import-export_unittest.bash \
864
	htools/offline-test.sh \
865
	htools/cli-tests.sh \
858 866
	$(all_python_code) \
859 867
	$(HS_LIB_SRCS) $(HS_PROG_SRCS)
860 868

  
......
1209 1217
	done
1210 1218

  
1211 1219
.PHONY: hs-check
1212
hs-check: htools/test
1220
hs-check: htools/test htools/htools
1213 1221
	@rm -f test.tix
1214 1222
	./htools/test
1223
	HBINARY="./htools/htools" ./htools/offline-test.sh
1215 1224

  
1216 1225
# E111: indentation is not a multiple of four
1217 1226
# E261: at least two spaces before inline comment

Also available in: Unified diff