+echo "Validating=YES" > mk/are-validating.mk
+
+$make -j$threads ValidateHpc=$hpc ValidateSlow=$slow
+
+$make binary-dist-prep
+$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
+# bindist with Cabal.
+#
+bindistdir="bindisttest/install dir"
+cd libraries/mtl
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs configure --with-ghc="$thisdir/$bindistdir/bin/ghc" --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs build --builddir=dist-bindist
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs install --builddir=dist-bindist
+"$thisdir/$bindistdir/bin/runhaskell" Setup.hs clean --builddir=dist-bindist
+cd $thisdir
+
+fi # testsuite-only
+
+if [ "$hpc" = YES ]
+then
+ # XXX With threads we'd need to give a different tix file to each thread
+ # and then sum them up at the end
+ threads=1
+ HPCTIXFILE=$thisdir/testsuite/hpc_output/ghc.tix
+ export HPCTIXFILE
+ rm -f $HPCTIXFILE
+fi
+
+if [ "$slow" = YES ]
+then
+MAKE_TEST_TARGET=fulltest
+else
+MAKE_TEST_TARGET=test
+fi
+
+$make $MAKE_TEST_TARGET stage=2 BINDIST=YES THREADS=$threads 2>&1 | tee testlog
+
+if [ "$hpc" = YES ]
+then
+ utils/hpc/hpc markup --hpcdir=. --srcdir=compiler --srcdir=testsuite/hpc_output --destdir=testsuite/hpc_output testsuite/hpc_output/ghc.tix
+fi
+
+echo "-------------------------------------------------------------------"