Allow per-component builds with coverage enabled #9464

alt-romes · 2023-11-22T17:21:16Z

This commits re-enables per-component builds when coverage checking is
enabled. This restriction was previously added in #5004 to fix #4798.

Program coverage crashes in cabal new-test #4798 was subsequently fixed "again" with the fix for cabal new-test doesn't work with library-coverage for components with other-modules #5213, in Hack around wrong .mix directories for tests #7493 by
fixing the paths of the testsuite .mix files to the same location as
that of the main library component.

Therefore the restriction to treat testsuites per-package
(legacy-fallback) is no longer needed.

We went further and fixed coverage for internal sublibraries, packages
with backpack (but without generating coverage information for
indefinite and instantiated units -- it is not clear what it would mean
for HPC to support this), and coverage for multi-package projects.

This (second) commit re-designs the mechanism by which we make the .mix files of
libraries available to produce the Haskell Program Coverage report after
running testsuites.

The idea, for the Cabal library, is:

* Cabal builds libraries with -fhpc, and store the hpc artifacts in
  build </> `extraCompilationArtifacts`
* At Cabal install time, `extraCompilationArtifacts` is copied into the
  package database
* At Cabal configure time, we both
    - receive as --coverage-for flags unit-ids of library components
      from the same package (ultimately, when #9493 is resolved, we will
      receive unit ids of libraries in other packages in the same
      project too),
    - and, when configuring a whole package instead of just a testsuite
      component, we determine the unit-ids of libraries in the package
  these unit-ids are written into `configCoverageFor` in `ConfigFlags`
* At Cabal test time, for each library to cover (stored in
  `configCoverageFor`), we look in the package database for the hpc
  dirs, which we eventually pass along to the `hpc markup` call as
  `--hpcdir` flags

As for cabal-install:

* After a plan has been elaborated, we select the packages which can be
  covered and pass them to Cabal's ./Setup configure as
  --coverage-for=<unit-id> flags.
    - Notably, valid libraries are non-indefinite and
      non-instantiations, since HPC does not support backpack.
    - Furthermore, we only include libraries in the same package as the
      component being configured, despite possibly there being
      more library components in other packages of the same project.
      When #9493 is resolved, we could lift this restriction and pass
      all libraries local to the package as --coverage-for. See
      `determineCoverageFor` and `shouldCoverPkg` in Distribution.Client.ProjectPlanning.

Fixes #6440 (internal libs coverage), #6397 (backpack breaks coverage),
doesn't yet fix #8609 (multi-package coverage report) which is tracked
in #9493, and fixes in a new way the previously fixed #4798, #5213.

QA Notes

Running cabal test cabal-install --enable-coverage in the root of the
cabal project should succeed and generate a coverage report for cabal-install.

Template Α: This PR modifies cabal behaviour

Include the following checklist in your PR:

Patches conform to the coding conventions.
Any changes that could be relevant to users have been recorded in the changelog.
The documentation has been updated, if necessary.
Manual QA notes have been included.
Tests have been added. (Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!)

alt-romes · 2023-11-22T17:22:06Z

There's a test missing for #6440, which I'm working on, and the test for #4798 is failing for some reason regarding the setup required to run the test as part of the cabal testsuite.

alt-romes · 2023-11-22T17:49:29Z

This is now good to go.

alt-romes · 2023-11-22T18:29:19Z

~~Could you help me understand what went wrong in the CI pipeline?~~

ffaf1 · 2023-11-22T19:13:17Z

Well, the test you introduced is failing. I assume it works fine on your machine?
The offending dieWithException is here

cabal/cabal-install/src/Distribution/Client/ProjectOrchestration.hs

Lines 1222 to 1233 in eaa5245

    
           dieIfNotHaddockFailure :: Verbosity -> String -> IO () 
        
           dieIfNotHaddockFailure verb str 
        
             | currentCommand == HaddockCommand = dieWithException verb $ DieIfNotHaddockFailureException str 
        
             | all isHaddockFailure failuresClassification = warn verb str 
        
             | otherwise = dieWithException verb $ DieIfNotHaddockFailureException str 
        
             where 
        
               isHaddockFailure 
        
                 (_, ShowBuildSummaryOnly (HaddocksFailed _)) = True 
        
               isHaddockFailure 
        
                 (_, ShowBuildSummaryAndLog (HaddocksFailed _) _) = True 
        
               isHaddockFailure 
        
                 _ = False

alt-romes · 2023-11-23T19:12:22Z

This patch should fix #6397 as well (see #6397 (comment)) as well (to the best of our extent AFAICT)

Not done yet! I'll finish it tomorrow.

fgaz

Looks like you rewrote some older commits in the last force push

Cabal/src/Distribution/Simple/Hpc.hs

cabal-install/src/Distribution/Client/ProjectPlanning.hs

cabal-install/src/Distribution/Client/Setup.hs

Fixed

fgaz · 2023-12-04T11:11:13Z

cabal-install/src/Distribution/Client/Setup.hs

+        , Cabal.testCoverageLibsModules = NoFlag
+        , Cabal.testCoverageDistPrefs = NoFlag


The flags have to be removed from flags_3_11_0. See the comments above for an explanation, and see filterConfigureFlags for how to add a new flags_ (they build on each other).

alt-romes · 2023-12-12T17:06:31Z

@mpickering @fgaz @geekosaur this is 100% there, ready to merge.

andreabedini

Good work 👍

I will add the "merge me" label since you say it's ready.

alt-romes · 2023-12-15T00:02:11Z

Good work 👍

I will add the "merge me" label since you say it's ready.

Thanks Andrea, that would be great

This commits re-enables per-component builds when coverage checking is enabled. This restriction was previously added in haskell#5004 to fix haskell#4798. - haskell#4798 was subsequently fixed "again" with the fix for haskell#5213, in haskell#7493 by fixing the paths of the testsuite `.mix` files to the same location as that of the main library component. Therefore the restriction to treat testsuites per-package (legacy-fallback) is no longer needed. We went further and fixed coverage for internal sublibraries, packages with backpack (but without generating coverage information for indefinite and instantiated units -- it is not clear what it would mean for HPC to support this), and coverage for multi-package projects. 1. We allow hpc in per-component builds 2. To generate hpc files in the appropriate component directories in the distribution tree, we remove the hack from haskell#7493 and instead determine the `.mix` directories that are included in the call to `hpc markup` by passing the list of components in the project from the cabal-install invocation of test. We also drop an unnecessary directory in the hpc file hierarchy. 3. To account for internal (non-backpack) libraries, we include the mix dirs and modules of all (non-indefinite and non-instantiations) libraries in the project Indefinite libraries and instantiations are ignored as it is not obvious what it means for HPC to support backpack, e.g. covering a library function that two different instantiations 4. We now only reject coverage if there are no libraries at all in the project, rather than if there are no libraries in the package. This allows us to drop the coverage masking logic in cabal.project.coverage while still having coverage of cabal-install (i.e. cabal test --enable-coverage cabal-install now works without the workaround) Even though we allow multi-package project coverage, we still cover each package independently -- the tix files resulting from all packages are not combined for the time being. Multi-package project coverage is fixed in Cabal, however, the paths to the source files listed in the `.mix` files will be incorrect because package sources will no longer be in the root of the project tree, but rather under the subdir with the package. We add an error for multi-package projects when coverage is enabled, and track lifting this error in haskell#9493. Includes tests for haskell#6440, haskell#6397, haskell#8609, and haskell#4798 (the test for haskell#5213 already exists) Fixes haskell#6440 (internal libs coverage), haskell#6397 (backpack breaks coverage) , doesn't yet fix haskell#8609 (multi-package coverage report) and fixes in a new way the previously fixed haskell#4798, haskell#5213.

This commit re-designs the mechanism by which we make the .mix files of libraries available to produce the Haskell Program Coverage report after running testsuites. The idea, for the Cabal library, is: * Cabal builds libraries with -fhpc, and store the hpc artifacts in build </> `extraCompilationArtifacts` * At Cabal install time, `extraCompilationArtifacts` is copied into the package database * At Cabal configure time, we both - receive as --coverage-for flags unit-ids of library components from the same package (ultimately, when haskell#9493 is resolved, we will receive unit ids of libraries in other packages in the same project too), - and, when configuring a whole package instead of just a testsuite component, we determine the unit-ids of libraries in the package these unit-ids are written into `configCoverageFor` in `ConfigFlags` * At Cabal test time, for each library to cover (stored in `configCoverageFor`), we look in the package database for the hpc dirs, which we eventually pass along to the `hpc markup` call as `--hpcdir` flags As for cabal-install: * After a plan has been elaborated, we select the packages which can be covered and pass them to Cabal's ./Setup configure as --coverage-for=<unit-id> flags. - Notably, valid libraries are non-indefinite and non-instantiations, since HPC does not support backpack. - Furthermore, we only include libraries in the same package as the component being configured, despite possibly there being more library components in other packages of the same project. When haskell#9493 is resolved, we could lift this restriction and pass all libraries local to the package as --coverage-for. See `determineCoverageFor` and `shouldCoverPkg` in Distribution.Client.ProjectPlanning. Detail: We no longer pass the path to the testsuite's mix dirs to `hpc markup` because we only ever include modules in libraries, which means they were previously unused. Fixes haskell#6440 (internal libs coverage), haskell#6397 (backpack breaks coverage), doesn't yet fix haskell#8609 (multi-package coverage report) which is tracked in haskell#9493, and fixes in a new way the previously fixed haskell#4798, haskell#5213.

alt-romes · 2023-12-18T22:26:17Z

Thanks all!

fgaz · 2023-12-19T10:22:49Z

@alt-romes could you complete the checklist I added back to OP in a follow-up PR? There were a few missing items.

alt-romes · 2023-12-19T10:25:06Z

@alt-romes could you complete the checklist I added back to OP in a follow-up PR? There were a few missing items.

I surely can, however, I don't understand what you mean by the "checklist I added back to OP". Which missing items are there?

fgaz · 2023-12-19T10:28:31Z

I surely can, however, I don't understand what you mean by the "checklist I added back to OP". Which missing items are there?

There is a list that is part of the pull request template. It was removed in your last edit of the PR escription but it was not complete, so I restored it in the last edit. It's currently missing documentation, changelog, and QA notes.

alt-romes · 2023-12-19T10:45:12Z

@fgaz Yes, apologies. I'll take care of that in a separate PR.

andreabedini · 2023-12-19T10:45:31Z

@fgaz I am sorry for overlooking those details. I would not mind if we used "request changes" when changes are needed. It would have prevented my mistake.

alt-romes · 2023-12-19T10:46:15Z

@andreabedini what does it mean exactly "documentation has been updated", i.e. which documentation?

Additionally, a Manual QA note for the same ticket: Running `cabal test cabal-install --enable-coverage` in the root of the cabal project should succeed and generate a coverage report for `cabal-install`.

andreabedini · 2023-12-19T13:36:05Z

@alt-romes I think @fgaz refers to the "The documentation has been updated, if necessary" item in the checklist. I this case I would understand it as checking the documentation for references to code coverage and see if they have to be updated.

Additionally, a Manual QA note for the same ticket: Running `cabal test cabal-install --enable-coverage` in the root of the cabal project should succeed and generate a coverage report for `cabal-install`.

Update changelog for per-component with coverage #9464

Additionally, a Manual QA note for the same ticket: Running `cabal test cabal-install --enable-coverage` in the root of the cabal project should succeed and generate a coverage report for `cabal-install`.

alt-romes force-pushed the wip/romes/4798 branch 2 times, most recently from aef4e35 to 7090763 Compare November 22, 2023 17:49

geekosaur approved these changes Nov 22, 2023

View reviewed changes

Mikolaj added the attention: needs-review label Nov 22, 2023

alt-romes force-pushed the wip/romes/4798 branch from 7090763 to dea60af Compare November 23, 2023 19:08

alt-romes mentioned this pull request Nov 23, 2023

backpack breaks --enable-coverage #6397

Closed

alt-romes force-pushed the wip/romes/4798 branch 4 times, most recently from c9fcfaa to 2cd3e6f Compare November 30, 2023 11:35

fgaz previously requested changes Nov 30, 2023

View reviewed changes

Cabal/src/Distribution/Simple/Hpc.hs Outdated Show resolved Hide resolved

cabal-install/src/Distribution/Client/ProjectPlanning.hs Outdated Show resolved Hide resolved

cabal-install/src/Distribution/Client/Setup.hs Outdated Show resolved Hide resolved

alt-romes force-pushed the wip/romes/4798 branch 2 times, most recently from ff03e64 to a7cf8d1 Compare November 30, 2023 18:22

alt-romes force-pushed the wip/romes/4798 branch 6 times, most recently from 6b9c481 to d0f3ff0 Compare December 4, 2023 09:37

alt-romes mentioned this pull request Dec 4, 2023

HPC: Coverage for multi-package projects #9493

Open

fgaz reviewed Dec 4, 2023

View reviewed changes

alt-romes force-pushed the wip/romes/4798 branch 3 times, most recently from fb411e9 to 5d29491 Compare December 4, 2023 11:44

alt-romes force-pushed the wip/romes/4798 branch 2 times, most recently from 3e5e73d to 9779d8f Compare December 12, 2023 14:54

geekosaur approved these changes Dec 12, 2023

View reviewed changes

andreabedini approved these changes Dec 14, 2023

View reviewed changes

andreabedini added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Dec 14, 2023

mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Dec 17, 2023

andreabedini force-pushed the wip/romes/4798 branch from 9779d8f to b12f4c8 Compare December 18, 2023 16:57

alt-romes force-pushed the wip/romes/4798 branch from b12f4c8 to d6e3804 Compare December 18, 2023 17:31

mergify bot merged commit feaa338 into haskell:master Dec 18, 2023
50 checks passed

alt-romes self-assigned this Dec 19, 2023

alt-romes mentioned this pull request Dec 19, 2023

Update changelog for per-component with coverage #9464 #9542

Merged

mergify bot added a commit that referenced this pull request Jan 5, 2024

Merge pull request #9542 from alt-romes/wip/romes/4798

ef8ab97

Update changelog for per-component with coverage #9464

BinderDavid mentioned this pull request Mar 29, 2024

Errors when trying to generate a test coverage report haskell/containers#997

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow per-component builds with coverage enabled #9464

Allow per-component builds with coverage enabled #9464

alt-romes commented Nov 22, 2023 •

edited

alt-romes commented Nov 22, 2023

alt-romes commented Nov 22, 2023

alt-romes commented Nov 22, 2023 •

edited

ffaf1 commented Nov 22, 2023

alt-romes commented Nov 23, 2023

fgaz left a comment

fgaz Dec 4, 2023 •

edited

alt-romes Dec 4, 2023

alt-romes commented Dec 12, 2023

andreabedini left a comment

alt-romes commented Dec 15, 2023

alt-romes commented Dec 18, 2023

fgaz commented Dec 19, 2023

alt-romes commented Dec 19, 2023

fgaz commented Dec 19, 2023

alt-romes commented Dec 19, 2023

andreabedini commented Dec 19, 2023

alt-romes commented Dec 19, 2023 •

edited

andreabedini commented Dec 19, 2023

		, Cabal.testCoverageLibsModules = NoFlag
		, Cabal.testCoverageDistPrefs = NoFlag

Allow per-component builds with coverage enabled #9464

Allow per-component builds with coverage enabled #9464

Conversation

alt-romes commented Nov 22, 2023 • edited

QA Notes

alt-romes commented Nov 22, 2023

alt-romes commented Nov 22, 2023

alt-romes commented Nov 22, 2023 • edited

ffaf1 commented Nov 22, 2023

alt-romes commented Nov 23, 2023

fgaz left a comment

Choose a reason for hiding this comment

fgaz Dec 4, 2023 • edited

Choose a reason for hiding this comment

alt-romes Dec 4, 2023

Choose a reason for hiding this comment

alt-romes commented Dec 12, 2023

andreabedini left a comment

Choose a reason for hiding this comment

alt-romes commented Dec 15, 2023

alt-romes commented Dec 18, 2023

fgaz commented Dec 19, 2023

alt-romes commented Dec 19, 2023

fgaz commented Dec 19, 2023

alt-romes commented Dec 19, 2023

andreabedini commented Dec 19, 2023

alt-romes commented Dec 19, 2023 • edited

andreabedini commented Dec 19, 2023

alt-romes commented Nov 22, 2023 •

edited

alt-romes commented Nov 22, 2023 •

edited

fgaz Dec 4, 2023 •

edited

alt-romes commented Dec 19, 2023 •

edited