Commit 26c7d944 authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Run ghc-pkg check during validate

Should help to track down cache-out-of-date problems
parent 896d0f1a
......@@ -49,6 +49,17 @@ do
shift
done
check_packages () {
echo "== Start $1 package check"
if [ "$bindistdir" = "" ]
then
inplace/bin/ghc-pkg check -v
else
"$bindistdir"/bin/ghc-pkg check -v
fi
echo "== End $1 package check"
}
if ! [ -d testsuite ]
then
echo 'You need the testsuite to validate' >&2
......@@ -97,6 +108,8 @@ echo "ValidateHpc=$hpc" >> mk/are-validating.mk
$make -j$threads
# For a "debug make", add "--debug=b --debug=m"
check_packages post-build
# -----------------------------------------------------------------------------
# Build and test a binary distribution (not --fast)
......@@ -112,7 +125,11 @@ if [ $speed != "FAST" ]; then
#
bindistdir="bindisttest/install dir"
check_packages post-install
$make validate_build_xhtml BINDIST_PREFIX="$thisdir/$bindistdir"
check_packages post-xhtml
fi
fi # testsuite-only
......@@ -147,6 +164,8 @@ esac
$make $MAKE_TEST_TARGET stage=2 $BINDIST THREADS=$threads 2>&1 | tee testlog
check_packages post-testsuite
if [ "$hpc" = YES ]
then
utils/hpc/hpc markup --hpcdir=. --srcdir=compiler --srcdir=testsuite/hpc_output --destdir=testsuite/hpc_output testsuite/hpc_output/ghc.tix
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment