Remove an old commented out import
[ghc.git] / validate
index eae6d01..91616dc 100755 (executable)
--- a/validate
+++ b/validate
@@ -90,9 +90,11 @@ 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 ValidateSpeed=$speed
+$make -j$threads
 # For a "debug make", add "--debug=b --debug=m"
 
 # -----------------------------------------------------------------------------
@@ -104,22 +106,13 @@ if [ $speed != "FAST" ]; then
     $make test_bindist TEST_PREP=YES
 
     #
-    # Install the mtl package into the bindist, because it is used by some
-    # tests.  It isn't essential that we do this (the failing tests will
-    # be treated as expected failures), but we get a bit more test
-    # coverage, and also verify that we can install a package into the
+    # Install the xhtml package into the bindist.
+    # This verifies that we can install a package into the
     # bindist with Cabal.
     #
-    bindistdir="bindisttest/install dir"
-    cd libraries/mtl
-    "$thisdir/$bindistdir/bin/ghc" --make Setup
-    ./Setup configure --with-ghc="$thisdir/$bindistdir/bin/ghc" --with-haddock="$thisdir/$bindistdir/bin/haddock" --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
-    ./Setup build   --builddir=dist-bindist
-    ./Setup haddock --builddir=dist-bindist
-    ./Setup install --builddir=dist-bindist
-    ./Setup clean   --builddir=dist-bindist
-    rm -f Setup Setup.exe Setup.hi Setup.o
-    cd $thisdir
+    bindistdir="bindisttest/install   dir"
+
+    $make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir"
 fi
 
 fi # testsuite-only