Revision 3096524e

b/Makefile.am
156 156
	stamp-srclinks \
157 157
	$(nodist_pkgpython_PYTHON) \
158 158
	$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
159
	$(HS_BUILT_TEST_HELPERS) \
159 160
	.hpc/*.mix htools/*.tix \
160 161
	doc/hs-lint.html
161 162

  
......
358 359

  
359 360
HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools
360 361
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
362
HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/%) test/hail
363

  
361 364
# we don't add -Werror by default
362 365
HFLAGS = -O -Wall -fwarn-monomorphism-restriction -fwarn-tabs -ihtools
363 366
# extra flags that can be overriden on the command line
......
840 843
if WANT_HTOOLSTESTS
841 844
nodist_TESTS += $(haskell_tests)
842 845
dist_TESTS += htools/offline-test.sh
843
check_SCRIPTS += htools/hpc-htools
846
check_SCRIPTS += htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
844 847
endif
845 848

  
846 849
TESTS = $(dist_TESTS) $(nodist_TESTS)
......
1150 1153
daemons/ganeti-watcher: MODULE = ganeti.watcher
1151 1154
scripts/%: MODULE = ganeti.client.$(subst -,_,$(notdir $@))
1152 1155
tools/ensure-dirs: MODULE = ganeti.tools.ensure_dirs
1156
$(HS_BUILT_TEST_HELPERS): TESTROLE = $(patsubst test/%,%,$@)
1153 1157

  
1154 1158
$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
1155 1159
	test -n "$(MODULE)" || { echo Missing module; exit 1; }
......
1178 1182
	} > $@
1179 1183
	chmod u+x $@
1180 1184

  
1185
$(HS_BUILT_TEST_HELPERS): Makefile
1186
	@test -n "$(TESTROLE)" || { echo Missing TESTROLE; exit 1; }
1187
	set -e; \
1188
	{ echo '#!/bin/sh'; \
1189
	  echo '# This file is automatically generated, do not edit!'; \
1190
	  echo "# Edit Makefile.am instead."; \
1191
	  echo; \
1192
	  echo "HTOOLS=$(TESTROLE) exec ./htools/hpc-htools \"\$$@\""; \
1193
	} > $@
1194
	chmod u+x $@
1195

  
1181 1196
# We need to create symlinks because "make distcheck" will not install Python
1182 1197
# files when building.
1183 1198
stamp-srclinks: Makefile | $(all_dirfiles)
......
1237 1252
	done
1238 1253

  
1239 1254
.PHONY: hs-check
1240
hs-check: htools/test htools/hpc-htools
1255
hs-check: htools/test htools/hpc-htools $(HS_BUILT_TEST_HELPERS)
1241 1256
	@rm -f test.tix
1242 1257
	./htools/test
1243 1258
	HBINARY="./htools/hpc-htools" ./htools/offline-test.sh

Also available in: Unified diff