Remove an old commented out import

[ghc.git] / validate

diff --git a/validate b/validate
index b1ae14f..91616dc 100755 (executable)
--- a/validate
+++ b/validate
@@ -9,7 +9,8 @@
 #                     compiler the test suite covers.
 #                     2008-07-01: 63% slower than the default.
 #                     HTML generated here: testsuite/hpc_output/hpc_index.html
-#   --fast:           Default. Opposite to --slow.
+#   --normal:         Default settings
+#   --fast:           Omit dyn way, omit binary distribution
 #   --slow:           Build stage2 with -DDEBUG.
 #                     2008-07-01: 14% slower than the default.
 
@@ -18,7 +19,7 @@ set -e
 no_clean=0
 testsuite_only=0
 hpc=NO
-slow=NO
+speed=NORMAL
 
 while [ $# -gt 0 ]
 do
@@ -33,10 +34,13 @@ do
         hpc=YES
         ;;
     --slow)
-        slow=YES
+        speed=SLOW
         ;;
     --fast)
-        slow=NO
+        speed=FAST
+        ;;
+    --normal)
+        speed=NORMAL
         ;;
     *)
         echo "Bad argument: $1" >&2
@@ -45,6 +49,13 @@ do
     shift
 done
 
+if ! [ -d testsuite ]
+then
+    echo 'You need the testsuite to validate' >&2
+    echo 'Run "./sync-all --testsuite get" to get it' >&2
+    exit 1
+fi
+
 if [ "$THREADS" = "" ]; then
     if [ "$CPUS" = "" ]; then
         threads=2
@@ -79,15 +90,36 @@ fi
 
 thisdir=`utils/ghc-pwd/dist-boot/ghc-pwd`
 
-echo "Validating=YES" > mk/are-validating.mk
+echo "Validating=YES"       >  mk/are-validating.mk
+echo "ValidateSpeed=$speed" >> mk/are-validating.mk
+echo "ValidateHpc=$hpc"     >> mk/are-validating.mk
 
-$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+$make -j$threads
+# For a "debug make", add "--debug=b --debug=m"
 
-$make binary-dist-prep
-$make test_bindist TEST_PREP=YES
+# -----------------------------------------------------------------------------
+# Build and test a binary distribution (not --fast)
+
+if [ $speed != "FAST" ]; then
+
+    $make binary-dist-prep
+    $make test_bindist TEST_PREP=YES
+
+    #
+    # Install the xhtml package into the bindist.
+    # This verifies that we can install a package into the
+    # bindist with Cabal.
+    #
+    bindistdir="bindisttest/install   dir"
+
+    $make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir"
+fi
 
 fi # testsuite-only
 
+# -----------------------------------------------------------------------------
+# Run the testsuite
+
 if [ "$hpc" = YES ]
 then
     # XXX With threads we'd need to give a different tix file to each thread
@@ -98,14 +130,22 @@ then
     rm -f $HPCTIXFILE
 fi
 
-if [ "$slow" = YES ]
-then
-MAKE_TEST_TARGET=fulltest
-else
-MAKE_TEST_TARGET=test
-fi
+case "$speed" in
+SLOW)
+        MAKE_TEST_TARGET=fulltest
+        BINDIST="BINDIST=YES"
+        ;;
+NORMAL)
+        MAKE_TEST_TARGET=test
+        BINDIST="BINDIST=YES"
+        ;;
+FAST)
+        MAKE_TEST_TARGET=test
+        BINDIST="BINDIST=NO"
+        ;;
+esac
 
-$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
+$make $MAKE_TEST_TARGET stage=2 $BINDIST THREADS=$threads 2>&1 | tee testlog
 
 if [ "$hpc" = YES ]
 then
@@ -116,7 +156,8 @@ echo "-------------------------------------------------------------------"
 if
     grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null &&
     grep '\<0 unexpected passes' testlog >/dev/null 2>/dev/null &&
-    grep '\<0 unexpected failures' testlog >/dev/null 2>/dev/null ; then
+    grep '\<0 unexpected failures' testlog >/dev/null 2>/dev/null &&
+    ! grep 'Some files are written by multiple tests' testlog >/dev/null 2>/dev/null ; then
     if [ $testsuite_only -eq 0 ] && [ $no_clean -eq 0 ]
     then
         cat <<EOF
@@ -128,7 +169,7 @@ the minimal testing procedure, please do further testing as necessary.
 When you are satisfied that you haven't broken anything, go ahead and
 push/send your patches.
 EOF
-        if grep -q "^[^#]" mk/validate.mk
+        if [ -f mk/validate.mk ] && grep -q "^[^#]" mk/validate.mk
         then
             cat <<EOF