[commit: ghc] master: Run ghc-pkg check during validate (26c7d94)
Ian Lynagh
igloo at earth.li
Thu May 30 21:41:17 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
https://github.com/ghc/ghc/commit/26c7d94426825b95c3828d929b2630baf7d0e09b
>---------------------------------------------------------------
commit 26c7d94426825b95c3828d929b2630baf7d0e09b
Author: Ian Lynagh <ian at well-typed.com>
Date: Thu May 30 20:38:51 2013 +0100
Run ghc-pkg check during validate
Should help to track down cache-out-of-date problems
>---------------------------------------------------------------
validate | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/validate b/validate
index 91616dc..170bb2d 100755
--- a/validate
+++ b/validate
@@ -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
More information about the ghc-commits
mailing list