Skip to content

Commit

Permalink
testsuite: Be explicit about runtime test dependencies
Browse files Browse the repository at this point in the history
Issue haskell#8356 reports occasional errors from running the testsuite about
multiple package versions available. This stems from the invokation of
`runghc` not being explicit about all dependencies of the testsuite.

The solution is provide a component in the cabal file which is explicit
about which packages the tests can depend on. This component has a
build-depends section which lists all the dependencies that the tests
require.

It would be better if this component was a library component but we
can't do this with a Custom setup because of limitations to do with
per-component builds.

Then we also enable `-hide-all-packages`, so the dependency will not be
available if it is not explicitly listed as a dependency.

You could also imagine a future where the Setup.hs script found the test
files and compiled a single executable which would run all the tests,
rather than invoking runghc on each one individually.

Fixes haskell#8356
  • Loading branch information
mpickering committed Nov 16, 2023
1 parent a8fc603 commit 72afedf
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 13 deletions.
9 changes: 9 additions & 0 deletions cabal-testsuite/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,15 @@ Otherwise, here is a walkthrough:
...
```

The dependencies which your test is allowed to use are listed in the
cabal file under the `test-runtime-deps` executable. At compile-time there is
a custom Setup.hs script which inspects this list and records the versions of
each package in a generated file. These are then used when `cabal-tests` runs
when it invokes `runghc` to run each test.
We ensure they are built and available by listing `test-runtime-deps` in the
build-tool-depends section of the cabal-tests executable.


3. Run your tests using `cabal-tests` (no need to rebuild when
you add or modify a test; it is automatically picked up).
The first time you run a test, assuming everything else is
Expand Down
2 changes: 1 addition & 1 deletion cabal-testsuite/Setup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ canonicalizePackageDB x = return x
-- non-Backpack.
cabalTestsPackages :: LocalBuildInfo -> [(OpenUnitId, ModuleRenaming)]
cabalTestsPackages lbi =
case componentNameCLBIs lbi (CExeName (mkUnqualComponentName "cabal-tests")) of
case componentNameCLBIs lbi (CExeName (mkUnqualComponentName "test-runtime-deps")) of
[clbi] -> -- [ (unUnitId $ unDefUnitId duid,rn) | (DefiniteUnitId duid, rn) <- componentIncludes clbi ]
componentIncludes clbi
_ -> error "cabalTestsPackages"
40 changes: 28 additions & 12 deletions cabal-testsuite/cabal-testsuite.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ executable cabal-tests
main-is: cabal-tests.hs
hs-source-dirs: main
ghc-options: -threaded
-- Make sure these are built before the executable is run
build-tool-depends: cabal-testsuite:test-runtime-deps
build-depends:
, cabal-testsuite
-- constraints inherited via lib:cabal-testsuite component
Expand All @@ -102,18 +104,6 @@ executable cabal-tests
, transformers
-- dependencies specific to exe:cabal-tests
, clock ^>= 0.7.2 || ^>=0.8
-- Extra dependencies used by PackageTests.
--
-- The runner allows the tests to use extra dependencies and the custom Prelude
-- from 'cabal-testsuite'.
-- However, if the tests use a dependency, say 'directory', and there are two
-- packages with the same unit id available in the store, the test fails since
-- it doesn't know which one to pick.
-- By including an extra dependency to directory, we force the test runner to
-- use a specific version directory, fixing the test failure.
--
-- See issue description and discussion: https://github.com/haskell/cabal/issues/8356
, directory

build-tool-depends: cabal-testsuite:setup
default-extensions: TypeOperators
Expand All @@ -123,6 +113,32 @@ executable setup
import: shared
main-is: Setup.simple.hs

-- This executable component is used to describe the runtime dependencies of
-- the tests. The Main.hs file and resulting executable are not useful in any way.

-- Ideally this would be an empty library, but because build-type: Custom, we can't
-- have sublibraries.

-- If you require an external dependency for a test it must be listed here.
executable test-runtime-deps
build-depends: cabal-testsuite,
base,
directory,
Cabal,
Cabal-syntax,
filepath,
transformers,
bytestring,
time,
process,
exceptions
main-is: static/Main.hs
if !os(windows)
build-depends: unix
else
build-depends:
, Win32

custom-setup
-- we only depend on even stable releases of lib:Cabal
-- and due to Custom complexity and ConstraintSetupCabalMaxVersion
Expand Down
1 change: 1 addition & 0 deletions cabal-testsuite/src/Test/Cabal/Script.hs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ runnerGhcArgs senv =
where
ghc_options = M.mempty { ghcOptPackageDBs = runnerPackageDbStack senv
, ghcOptPackages = toNubListR (runnerPackages senv)
, ghcOptHideAllPackages = Flag True
-- Avoid picking stray module files that look
-- like our imports
, ghcOptSourcePathClear = Flag True }
3 changes: 3 additions & 0 deletions cabal-testsuite/static/Main.hs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module Main where

main = return ()
15 changes: 15 additions & 0 deletions changelog.d/issue-6006
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
synopsis: Fix assertion failure when --enable-documentation is enabled
packages: cabal-install
prs: #9446
issuesa: #6006

description: {

If any non-library components ended up in the install plan for a library and
--enable-documentation was enabled, then cabal would throw an assertion failure
due to mismatched hashes. Now the relevant part of the package description is not
updated after the hash has been calculated, and the check about whether to actually build documentation happens
at the point documentation is built.


}

0 comments on commit 72afedf

Please sign in to comment.