Use test.sh to generate coverage info

cabal does not work with coverage when tests are in a different package.

.circleci/config.yml

@@ -328,10 +328,6 @@ jobs:
         - *restore
         - run:
             name: Build and test with inspection, coverage, Werror
-            environment:
-              BUILD: "cabal-v2"
-              COVERALLS_OPTIONS: "--repo-token=\"$REPO_TOKEN\" --coverage-mode=StrictlyFullLines --exclude-dir=test"
-              CABAL_PROJECT: "cabal.project.coverage"
             command: |
               apt-get install -y ghc-8.10.2
               apt-get install -y cabal-install-3.2
@@ -339,7 +335,12 @@ jobs:
               apt-get install -y libcurl4-gnutls-dev
               apt-get install -y git
               apt-get install libtinfo-dev
-              bash -c "$PACKCHECK $BUILD"
+              cabal update
+              PATH=$HOME/.cabal/bin:$PATH
+              export PATH
+              which hpc-coveralls 2>/dev/null || cabal install --project-file cabal.project.coverage hpc-coveralls
+              bin/test.sh --coverage --raw
+              hpc-coveralls --repo-token="$REPO_TOKEN" --coverage-mode=StrictlyFullLines
             no_output_timeout: 25m
         - *save
   hlint-src:

bin/test.sh

@@ -35,6 +35,7 @@ set_common_vars
 COVERAGE=
 MEASURE=1
 HPC_REPORT_OPTIONS=
+RAW=0
 
 # XXX add a bisect option
 while test -n "$1"
@@ -47,6 +48,7 @@ do
     --hpc-report-options) shift; HPC_REPORT_OPTIONS=$1; shift ;;
     --rtsopts) shift; RTS_OPTIONS=$1; shift ;;
     # flags
+    --raw) RAW=1; shift ;;
     --slow) SLOW=1; shift ;;
     --quick) QUICK_MODE=1; shift ;;
     --dev-build) RUNNING_DEVBUILD=1; shift ;;
@@ -140,7 +142,7 @@ fi
 # Run coverage reports
 #-----------------------------------------------------------------------------
 
-if test "$COVERAGE" -eq "1"
+if test "$COVERAGE" -eq "1" -a "$RAW" -eq 0
 then
   TIXFILES=
   for i in $TARGETS