X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=91b7f33822a1db1ba0118158793faa963938a137;hp=94de1cd20e70e091b71987928c2bbc5627f96048;hb=e43a5e498520b933a0d9f4c7e9ddfb7ed2032cfd;hpb=9000c679a8904a398022b96e01649120e024c615

diff --git a/validate b/validate
index 94de1cd..91b7f33 100644
--- a/validate
+++ b/validate
@@ -54,9 +54,7 @@ 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
 
     INSTDIR=`pwd`/inst
     if [ "$OSTYPE" = "cygwin" ]
@@ -80,7 +78,7 @@ if [ $no_clean -eq 0 ]; then
     ./configure --prefix="$INSTDIR" $config_args
 fi
 
-thisdir=`utils/pwd/pwd`
+thisdir=`utils/ghc-pwd/ghc-pwd`
 
 echo "Validating=YES" > mk/are-validating.mk
 
@@ -128,6 +126,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,
@@ -135,13 +136,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 "-------------------------------------------------------------------"