diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-07-25 13:57:51 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-07-25 13:57:51 +0000 |
| commit | 2924c4bc8e4a433c1816695d22319b63a328b418 (patch) | |
| tree | ffa97a3b16f85927732f09d46df8762a5b1906a5 /validate | |
| parent | eb5791fe867f6441d270344298678f45ed4a75e4 (diff) | |
| download | haskell-2924c4bc8e4a433c1816695d22319b63a328b418.tar.gz | |
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.
Diffstat (limited to 'validate')
| -rw-r--r-- | validate | 24 |
1 files changed, 21 insertions, 3 deletions
@@ -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 |