X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=a042664d300d8f444f91f937dbabb337aea5faea;hb=883d980815437736c486bf69b2f066ef918d2989;hp=b364f575851f3921b7c4495c0840de588495c29d;hpb=028d076605ade76f738fab91fdf3da3baa976c30;p=ghc-hetmet.git

diff --git a/validate b/validate
index b364f57..a042664 100644
--- a/validate
+++ b/validate
@@ -48,34 +48,25 @@ done
 if [ "$CPUS" = "" ]; then
     threads=2
 else
-    threads=$((($CPUS + 1) * 2)) # `expr $CPUS + 1`
+    threads=$(($CPUS + 1)) # `expr $CPUS + 1`
 fi
 
 if [ $testsuite_only -eq 0 ]; then
 
 if [ $no_clean -eq 0 ]; then
-    if [ -f mk/config.mk ]; then
-        make distclean
-    fi
+    make maintainer-clean NO_CLEAN_GMP=YES
 
-    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
+    INSTDIR=`pwd`/inst
+    if [ "$OSTYPE" = "cygwin" ]
+    then
+        INSTDIR=`cygpath -m "$INSTDIR"`
+    fi
 
     sh boot
-    ./configure "--prefix=`pwd`/inst" $config_args
+    ./configure --prefix="$INSTDIR" $config_args
 fi
 
-thisdir=`utils/pwd/pwd forwardslash`
+thisdir=`utils/ghc-pwd/ghc-pwd`
 
 echo "Validating=YES" > mk/are-validating.mk
 
@@ -92,6 +83,9 @@ 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
 
 if [ "$hpc" = YES ]
@@ -123,6 +117,9 @@ WARNING: You seem to have things set in mk/validate.mk. Please check
 that it is OK before pushing.
 EOF
         fi
+        cat <<EOF
+-------------------------------------------------------------------
+EOF
     else
         cat <<EOF
 I didn't find any problems, but this wasn't a complete validate run,
@@ -130,13 +127,15 @@ so be careful!
 
 NOTE: If you have made changes that may cause failures not tested for by
 the minimal testing procedure, please do further testing as necessary.
+-------------------------------------------------------------------
 EOF
    fi
 else
     cat <<EOF
 Oops!  Looks like you have some unexpected test results or framework failures.
 Please fix them before pushing/sending patches.
+-------------------------------------------------------------------
 EOF
+    exit 1
 fi
-echo "-------------------------------------------------------------------"