updated hpc

tests/coverage.hs

@@ -1,10 +0,0 @@
-#!/usr/bin/env runhaskell
-
-import System.Cmd
-
--- generate appropriate .hpc files
-main = do
-    system $ "rm -rf *.tix"
-    system $ "dist/build/xmonad/xmonad --run-tests"
-    system $ "hpc markup xmonad --exclude=Main --exclude=Properties --exclude=XMonad --exclude=Paths_xmonad"
-    system $ "hpc report xmonad --exclude=Main --exclude=Properties --exclude=XMonad --exclude=Paths_xmonad"

util/hpcReport.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ ! -e xmonad.cabal ]; then
+  echo "run in the same dir as xmonad.cabal after having run
+
+      cabal configure --enable-tests --enable-library-coverage; cabal test
+
+        "
+  exit 1
+fi
+
+for action in markup report; do
+  hpc $action \
+    --exclude=Instances \
+    --exclude=Utils \
+    --exclude=Main \
+    $(find tests/Properties -name '*.hs' | sed -e 's_/_._g' -e 's_.hs$__' -e 's_^tests._--exclude=_' ) \
+    --hpcdir=dist/hpc/mix/xmonad-0.12/  \
+    dist/hpc/tix/properties/properties.tix
+done