From 2924c4bc8e4a433c1816695d22319b63a328b418 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 25 Jul 2007 13:57:51 +0000 Subject: [PATCH] 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. --- validate | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/validate b/validate index 39fa819..7949d62 100644 --- a/validate +++ b/validate @@ -16,12 +16,30 @@ cat mk/build.mk.sample >>mk/build.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 + # ToDo: make -j doesn't work in libraries/ on Windows (see #1559) + case $OSTYPE in + cygwin|msys) threads=1;; + *) threads=2;; + esac +else + threads=`expr $CPUS + 1` +fi + 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 -- 1.7.10.4