X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=bf007ab9699ddf3bfbc45e81a74deee96a8e8ee9;hb=e2587381bec9e1ef5953c2596c4090af05d39aac;hp=a042664d300d8f444f91f937dbabb337aea5faea;hpb=ca9e16a468bef1e40c6675afb0b632f53ca60a09;p=ghc-hetmet.git

diff --git a/validate b/validate
index a042664..bf007ab 100644
--- 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
@@ -62,7 +66,7 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    sh boot
+    /usr/bin/perl -w boot
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
@@ -71,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 ]
@@ -83,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