projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warnings in ghc-pkg on Windows
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
index
7949d62
..
cb9b307
100644
(file)
--- a/
validate
+++ b/
validate
@@
-1,4
+1,6
@@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
if [ -f mk/config.mk ]; then
make distclean
if [ -f mk/config.mk ]; then
make distclean
@@
-9,8
+11,11
@@
if [ -f mk/build.mk ]; then
fi
# The default is a "quick" build
fi
# The default is a "quick" build
-echo BuildFlavour=quick >mk/build.mk
-cat mk/build.mk.sample >>mk/build.mk
+echo "BuildFlavour = quick" > mk/build.mk
+echo "HADDOCK_DOCS = YES" >> mk/build.mk
+cat mk/build.mk.sample >> mk/build.mk
+echo "SRC_HC_OPTS += -Werror" >> mk/build.mk
+echo "SRC_CC_OPTS += -Werror" >> mk/build.mk
# You can override the default validate settings using mk/validate.mk
# e.g. you could add GhcLibWays=p to test profiling.
# You can override the default validate settings using mk/validate.mk
# e.g. you could add GhcLibWays=p to test profiling.
@@
-25,13
+30,9
@@
case $OSTYPE in
esac
if [ "$CPUS" = "" ]; then
esac
if [ "$CPUS" = "" ]; then
- # ToDo: make -j doesn't work in libraries/ on Windows (see #1559)
- case $OSTYPE in
- cygwin|msys) threads=1;;
- *) threads=2;;
- esac
+ threads=2
else
else
- threads=`expr $CPUS + 1`
+ threads=`expr $CPUS + 1`
fi
sh boot
fi
sh boot
@@
-47,7
+48,7
@@
if
grep '\<0 unexpected passes' testlog >/dev/null 2>/dev/null &&
grep '\<0 unexpected failures' testlog >/dev/null 2>/dev/null ; then
echo "-------------------------------------------------------------------"
grep '\<0 unexpected passes' testlog >/dev/null 2>/dev/null &&
grep '\<0 unexpected failures' testlog >/dev/null 2>/dev/null ; then
echo "-------------------------------------------------------------------"
- echo "Congratulations! This tree is has passed minimal testing."
+ echo "Congratulations! This tree has passed minimal testing."
echo
echo "NOTE: If you have made changes that may cause failures not tested"
echo "for by the minimal testing procedure, please do further testing"
echo
echo "NOTE: If you have made changes that may cause failures not tested"
echo "for by the minimal testing procedure, please do further testing"