Don't raise a throwTo when the target is masking and BlockedOnBlackHole
[ghc.git] / validate
index a0b9e16..bf007ab 100644 (file)
--- a/validate
+++ b/validate
@@ -45,10 +45,14 @@ do
     shift
 done
 
-if [ "$CPUS" = "" ]; then
-    threads=2
+if [ "$THREADS" = "" ]; then
+    if [ "$CPUS" = "" ]; then
+        threads=2
+    else
+        threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    fi
 else
-    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    threads="$THREADS"
 fi
 
 if [ $testsuite_only -eq 0 ]; then
@@ -61,20 +65,8 @@ if [ $no_clean -eq 0 ]; then
     then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
-    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
-            if [ -f c:/mingw/bin/ld.exe ]
-            then
-                config_args="$config_args --with-ld=c:/mingw/bin/ld"
-            fi
-            ;;
-    esac
 
-    sh boot
+    /usr/bin/perl -w boot
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
@@ -83,6 +75,10 @@ thisdir=`utils/ghc-pwd/ghc-pwd`
 echo "Validating=YES" > mk/are-validating.mk
 
 make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+make binary-dist-prep
+make -C bindisttest TEST_PREP=YES
+
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -95,10 +91,7 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
-
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then