X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=validate;h=866ab09fa899f6f4d5e64d37252bc5268befcd2c;hb=8df3ac7096bde788e2c3bde4389a2bb6f0e444f2;hp=b2c6771039c55a0105b3fb3f02a177ca08287fbe;hpb=4f53271d1d97abae819dbe3c7ff63b19749505cf;p=ghc-hetmet.git diff --git a/validate b/validate index b2c6771..866ab09 100644 --- a/validate +++ b/validate @@ -5,11 +5,14 @@ # a previous interrupted validation run # --testsuite-only: don't build the compiler, just run # the test suite +# --hpc: build stage2 with -fhpc, and see how much of the +# compiler the test suite covers set -e no_clean=0 testsuite_only=0 +hpc=0 while [ $# -gt 0 ] do @@ -20,6 +23,9 @@ do --testsuite-only) testsuite_only=1 ;; + --hpc) + hpc=1 + ;; *) echo "Bad argument: $1" >&2 exit 1;; @@ -51,11 +57,33 @@ fi sh boot ./configure "--prefix=`pwd`/inst" $config_args -make Validating=YES -j$threads +thisdir=`utils/pwd/pwd forwardslash` + +if [ "$hpc" = 1 ] +then + hpcflags="ValidateHpcFlags=-fhpc -hpcdir $thisdir/testsuite/hpc_output/" +fi + +make Validating=YES -j$threads ${hpcflags+"$hpcflags"} fi # testsuite-only +if [ "$hpc" = 1 ] +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 + make Validating=YES -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 THREADS=$threads 2>&1 | tee testlog +if [ "$hpc" = 1 ] +then + utils/hpc/hpc markup --hpcdir=. --srcdir=compiler --srcdir=testsuite/hpc_output --destdir=testsuite/hpc_output testsuite/hpc_output/ghc.tix +fi + echo "-------------------------------------------------------------------" if grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null &&