Merge branch 'master' of gitlab.haskell.org:ghc/packages/hpc into HEAD

.arcconfig

-{
-  "project.name"        : "hpc",
-  "repository.callsign" : "HPC",
-  "phabricator.uri"     : "https://phabricator.haskell.org"
-}

.gitlab-ci.yml

+variables:
+  # Commit of ghc/ci-images repository from which to pull Docker images
+  DOCKER_REV: "853f348f9caf38b08740b280296fbd34e09abb3a"
+
+build:
+  image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
+  tags:
+    - "x86_64-linux"
+  script:
+    - "cabal build -w $GHC lib:hpc"
+    - "cabal test -w $GHC"

.travis.yml

-env:
- - GHCVER=7.2.2
- - GHCVER=7.4.1
- - GHCVER=7.4.2
- - GHCVER=7.6.1
- - GHCVER=7.6.2
- - GHCVER=7.6.3
-
-before_install:
- - sudo add-apt-repository -y ppa:hvr/ghc
- - sudo apt-get update
- - sudo apt-get install cabal-install-1.18 ghc-$GHCVER
- - export PATH=/opt/ghc/$GHCVER/bin:$PATH
-
-install:
- - cabal-1.18 update
- - ghc --version
-
-script:
- - cabal-1.18 configure -v2
- - cabal-1.18 build
- - cabal-1.18 check
- - cabal-1.18 sdist

tests/raytrace/test.T

@@ -12,6 +12,6 @@ hpc_prefix = "perl hpcrun.pl --clear --exeext={exeext} --hpc={hpc}"
 # not the same) copy of this program.
 test('hpc_raytrace',
      [extra_files(['../hpcrun.pl', 'CSG.hs', 'Construct.hs', 'Data.hs', 'Eval.hs', 'Geometry.hs', 'Illumination.hs', 'Intersections.hs', 'Interval.hs', 'Main.hs', 'Misc.hs', 'Parse.hs', 'Primitives.hs', 'Surface.hs', 'galois.gml', 'galois.sample']),
-      cmd_prefix(hpc_prefix), reqlib('parsec'), ignore_stdout],
+      cmd_prefix(hpc_prefix), ignore_stdout],
      multimod_compile_and_run, ['Main','-fhpc -package parsec'])