Commit 2924c4bc authored by Simon Marlow's avatar Simon Marlow
Browse files

make validate work on Windows

This includes automatically adding --build=i386-unknown-mingw32 and
--with-gcc to ./configure, and disabling -j2 (see #1559).

Also: you can now say 

  CPUS=3 ./validate

and the script will pass -jN to make (where N = $CPUS + 1).  In the
future, when we fix #1558, it can pass THREADS=N to the testsuite, too.
parent eb5791fe
......@@ -16,12 +16,30 @@ cat mk/ >>mk/
# e.g. you could add GhcLibWays=p to test profiling.
echo '-include $(TOP)/mk/' >>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"
if [ "$CPUS" = "" ]; then
# ToDo: make -j doesn't work in libraries/ on Windows (see #1559)
case $OSTYPE in
cygwin|msys) threads=1;;
*) threads=2;;
threads=`expr $CPUS + 1`
sh boot
# 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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment