projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't give warnings in compat
[ghc-hetmet.git]
/
validate
diff --git
a/validate
b/validate
index
39fa819
..
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,19
+11,36
@@
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.
echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk
# You can override the default validate settings using mk/validate.mk
# e.g. you could add GhcLibWays=p to test profiling.
echo '-include $(TOP)/mk/validate.mk' >>mk/build.mk
+case $OSTYPE in
+ cygwin|msys) config_args=--build=i386-unknown-mingw32
+ if [ -f c:/mingw/bin/gcc.exe ]; then
+ config_args="$config_args --with-gcc=c:/mingw/bin/gcc"
+ fi
+ ;;
+esac
+
+if [ "$CPUS" = "" ]; then
+ threads=2
+else
+ threads=`expr $CPUS + 1`
+fi
+
sh boot
sh boot
-./configure
-# ToDo: configure args
+./configure $config_args
-make -j2
+make -j$threads
+# ToDo: use THREADS=$threads, see #1558
make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
if
make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog
if
@@
-29,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"