Revision 39f0eea5
b/Makefile.am | ||
---|---|---|
401 | 401 |
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) |
402 | 402 |
HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=htest/%) htest/hail |
403 | 403 |
|
404 |
HFLAGS = -O -Wall -Werror -fwarn-monomorphism-restriction -fwarn-tabs -ihtools |
|
404 |
HFLAGS = \ |
|
405 |
-O -Wall -Werror -ihtools \ |
|
406 |
-fwarn-monomorphism-restriction \ |
|
407 |
-fwarn-tabs \ |
|
408 |
$(GHC_BYVERSION_FLAGS) |
|
409 |
|
|
405 | 410 |
# extra flags that can be overriden on the command line (e.g. -Wwarn, etc.) |
406 | 411 |
HEXTRA = |
407 | 412 |
# internal extra flags (used for htest/test mainly) |
b/configure.ac | ||
---|---|---|
430 | 430 |
AC_MSG_FAILURE([ghc not found, compilation will not possible]) |
431 | 431 |
fi |
432 | 432 |
|
433 |
AC_MSG_CHECKING([checking for extra GHC flags]) |
|
434 |
GHC_BYVERSION_FLAGS="" |
|
435 |
# check for GHC supported flags that vary accross versions |
|
436 |
for flag in -fwarn-incomplete-uni-patterns; do |
|
437 |
if $GHC -e "0" $flag >/dev/null 2>/dev/null; then |
|
438 |
GHC_BYVERSION_FLAGS="$GHC_BYVERSION_FLAGS $flag" |
|
439 |
fi |
|
440 |
done |
|
441 |
AC_MSG_RESULT($GHC_BYVERSION_FLAGS) |
|
442 |
AC_SUBST(GHC_BYVERSION_FLAGS) |
|
443 |
|
|
433 | 444 |
# Check for ghc-pkg |
434 | 445 |
AC_ARG_VAR(GHC_PKG, [ghc-pkg path]) |
435 | 446 |
AC_PATH_PROG(GHC_PKG, [ghc-pkg], []) |
b/htest/Test/Ganeti/HTools/Cluster.hs | ||
---|---|---|
346 | 346 |
prop_CheckConsistency :: Node.Node -> Instance.Instance -> Bool |
347 | 347 |
prop_CheckConsistency node inst = |
348 | 348 |
let nl = makeSmallCluster node 3 |
349 |
[node1, node2, node3] = Container.elems nl |
|
349 |
(node1, node2, node3) = |
|
350 |
case Container.elems nl of |
|
351 |
[a, b, c] -> (a, b, c) |
|
352 |
l -> error $ "Invalid node list out of makeSmallCluster/3: " ++ |
|
353 |
show l |
|
350 | 354 |
node3' = node3 { Node.group = 1 } |
351 | 355 |
nl' = Container.add (Node.idx node3') node3' nl |
352 | 356 |
inst1 = Instance.setBoth inst (Node.idx node1) (Node.idx node2) |
Also available in: Unified diff