X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=741daacecb2b02fc666afbbf7ae74ce698d0a147;hp=4e2352b9cbc9d64376d1c3d00e987930f858abdf;hb=fc5cd848af22c97dfde1953b9efcfc60e6ccf2bb;hpb=31a9d04804d9cacda35695c5397590516b964964

diff --git a/validate b/validate
index 4e2352b..741daac 100644
--- a/validate
+++ b/validate
@@ -48,34 +48,33 @@ 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
-            ;;
-    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
 
 make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+make binary-dist-prep
+make -C bindisttest TEST_PREP=YES
+
 fi # testsuite-only
 
 if [ "$hpc" = YES ]
@@ -88,7 +87,7 @@ then
     rm -f $HPCTIXFILE
 fi
 
-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
@@ -119,6 +118,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,
@@ -126,13 +128,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 "-------------------------------------------------------------------"