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

diff --git a/validate b/validate
old mode 100644
new mode 100755
index a042664..b1ae14f
--- a/validate
+++ b/validate
@@ -45,16 +45,27 @@ 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="$THREADS"
+fi
+
+if type gmake > /dev/null 2> /dev/null
+then
+    make="gmake"
 else
-    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
+    make="make"
 fi
 
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then
-    make maintainer-clean NO_CLEAN_GMP=YES
+    $make maintainer-clean NO_CLEAN_GMP=YES
 
     INSTDIR=`pwd`/inst
     if [ "$OSTYPE" = "cygwin" ]
@@ -62,15 +73,19 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    sh boot
+    /usr/bin/perl -w boot --validate --required-tag=dph
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
-thisdir=`utils/ghc-pwd/ghc-pwd`
+thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
 
 echo "Validating=YES" > mk/are-validating.mk
 
-make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+$make binary-dist-prep
+$make test_bindist TEST_PREP=YES
+
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -83,10 +98,14 @@ then
     rm -f $HPCTIXFILE
 fi
 
-make binary-dist-prep
-make -C bindisttest TEST_PREP=YES
+if [ "$slow" = YES ]
+then
+MAKE_TEST_TARGET=fulltest
+else
+MAKE_TEST_TARGET=test
+fi
 
-make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog
+$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then