Skip to content

Commit c44a20e

Browse files
committed
Explicitly list testTargets
`testTarget` is a space separated list of test-suites. We explicitly list all test suites. This allows us to implement logic in the nixpkgs builder to run test suites in separate passthru.test derivations.
1 parent 89857ea commit c44a20e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
112112
& jailbreak .~ False
113113
& doCheck .~ True
114114
& doBenchmark .~ False
115-
& testTarget .~ mempty
115+
& testTarget .~ unwords (map (unUnqualComponentName . testName) testSuites)
116116
& hyperlinkSource .~ True
117117
& enableSplitObjs .~ True
118118
& enableLibraryProfiling .~ False

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ opencvOverrides = set phaseOverrides "hardeningDisable = [ \"bindnow\" ];"
358358
. over (libraryDepends . pkgconfig) (replace (pkg "opencv") (pkg "opencv3"))
359359

360360
hspecCoreOverrides :: Derivation -> Derivation -- https://github.com/hspec/hspec/issues/330
361-
hspecCoreOverrides = set phaseOverrides "testTarget = \"--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'\";"
361+
hspecCoreOverrides = set testTarget "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"
362362

363363
cabal2nixOverrides :: Derivation -> Derivation
364364
cabal2nixOverrides = set phaseOverrides $ unlines

0 commit comments

Comments
 (0)