Visitar URL original
Use bytestring for test target problem test · haskell/cabal@aafd4a4 · GitHub
Skip to content

Commit aafd4a4

Browse files
philderbeastphilderbeast
committed
Use bytestring for test target problem test
1 parent c9b2d20 commit aafd4a4

3 files changed

Lines changed: 11 additions & 16 deletions

File tree

‎cabal-install/tests/IntegrationTests2.hs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -818,12 +818,12 @@ testTargetProblemsCommon config0 = do
818818

819819
( \_ ->
820820
TargetComponentNotProjectLocal
821-
(pkgIdMap Map.! "filepath")
822-
(CTestName "filepath-tests")
821+
(pkgIdMap Map.! "bytestring")
822+
(CTestName "bytestring-tests")
823823
WholeComponent
824824
, mkTargetComponent
825-
(pkgIdMap Map.! "filepath")
826-
(CTestName "filepath-tests")
825+
(pkgIdMap Map.! "bytestring")
826+
(CTestName "bytestring-tests")
827827
)
828828
, -- Components can be explicitly @buildable: False@
829829

@@ -877,8 +877,11 @@ testTargetProblemsCommon config0 = do
877877
, projectConfigShared =
878878
(projectConfigShared config0)
879879
{ projectConfigConstraints =
880-
[
881-
( UserConstraint (UserAnyQualifier "filepath") PackagePropertySource
880+
[ -- Constrain bytestring to a source instance, not the
881+
-- installed one, so that its test suite is in the plan.
882+
-- Any package with a test suite would do but the bytestring
883+
-- package has wide upper bounds.
884+
( UserConstraint (UserAnyQualifier "bytestring") PackagePropertySource
882885
, ConstraintSourceUnknown
883886
)
884887
]

‎cabal-install/tests/IntegrationTests2/targets/complex/cabal.project‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
11
packages: q/
2-
3-
if impl(ghc >= 10.0.1)
4-
-- When ghc-10.0.1, or later, is released remove this conditional block and
5-
-- the allow-newer exception.
6-
packages: ghc-10.0.1-is-released-remove-this-workaround/
7-
elif impl(ghc >= 10.0)
8-
-- When using a pre-release of ghc-10
9-
allow-newer: filepath:base

‎cabal-install/tests/IntegrationTests2/targets/complex/q/q.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cabal-version: >= 1.2
55

66
library
77
exposed-modules: Q
8-
-- we rely that filepath has filepath-tests component
9-
build-depends: base, filepath >=1.4.0.0
8+
-- we rely that bytestring has bytestring-tests component
9+
build-depends: base, bytestring
1010

1111
executable buildable-false
1212
main-is: Main.hs

0 commit comments

Comments
 (0)