X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=8d6e2c3043a9aac3233cc0ab4604c59ba493065e;hp=5becd3fb0c863182d7b56ab0d70d9b1bda13425f;hb=5882c5ff503c5b3b425708621cbc3371cc36e5de;hpb=619f6709b307d9b51e7aae94d3d564a438282fe9

diff --git a/validate b/validate
index 5becd3f..8d6e2c3 100644
--- a/validate
+++ b/validate
@@ -73,11 +73,11 @@ if [ $no_clean -eq 0 ]; then
         INSTDIR=`cygpath -m "$INSTDIR"`
     fi
 
-    /usr/bin/perl -w boot
+    /usr/bin/perl -w boot --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
 
@@ -98,7 +98,14 @@ then
     rm -f $HPCTIXFILE
 fi
 
-$make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
+if [ "$slow" = YES ]
+then
+MAKE_TEST_TARGET=fulltest
+else
+MAKE_TEST_TARGET=test
+fi
+
+$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then