File tree 4 files changed +19
-12
lines changed
tests/UnitTests/Distribution/Client
4 files changed +19
-12
lines changed Original file line number Diff line number Diff line change @@ -1320,7 +1320,8 @@ Miscellaneous options
1320
1320
# Setup.hs script of package foo.
1321
1321
$ cabal install --constraint="foo:setup.bar == 1.0"
1322
1322
1323
- # Example use of the 'exe' (executable build tool)
1323
+ .. TODO: Uncomment this example once we decide on a syntax for 'exe'.
1324
+ .. # Example use of the 'exe' (executable build tool)
1324
1325
# qualifier. This constraint applies to package baz when it
1325
1326
# is a dependency of the build tool bar being used to
1326
1327
# build package foo.
Original file line number Diff line number Diff line change @@ -746,12 +746,15 @@ instance Text UserConstraint where
746
746
do _ <- Parse. string " :setup."
747
747
pn2 <- parse
748
748
return (UserSetup pn, pn2)
749
- +++
750
- do _ <- Parse. string " :"
751
- pn2 <- parse
752
- _ <- Parse. string " :exe."
753
- pn3 <- parse
754
- return (UserExe pn pn2, pn3)
749
+
750
+ -- -- TODO: Re-enable parsing of UserExe once we decide on a syntax.
751
+ --
752
+ -- +++
753
+ -- do _ <- Parse.string ":"
754
+ -- pn2 <- parse
755
+ -- _ <- Parse.string ":exe."
756
+ -- pn3 <- parse
757
+ -- return (UserExe pn pn2, pn3)
755
758
756
759
-- Package property
757
760
let keyword str x = Parse. skipSpaces1 >> Parse. string str >> return x
Original file line number Diff line number Diff line change @@ -568,7 +568,9 @@ instance Arbitrary RemoteRepo where
568
568
instance Arbitrary UserQualifier where
569
569
arbitrary = oneof [ pure UserToplevel
570
570
, UserSetup <$> arbitrary
571
- , UserExe <$> arbitrary <*> arbitrary
571
+
572
+ -- -- TODO: Re-enable UserExe tests once we decide on a syntax.
573
+ -- , UserExe <$> arbitrary <*> arbitrary
572
574
]
573
575
574
576
instance Arbitrary UserConstraint where
Original file line number Diff line number Diff line change @@ -12,7 +12,6 @@ import Distribution.ParseUtils (parseCommaList)
12
12
import Distribution.Text (parse )
13
13
14
14
import Distribution.Solver.Types.PackageConstraint (PackageProperty (.. ))
15
- import Distribution.Solver.Types.OptionalStanza (OptionalStanza (.. ))
16
15
17
16
import Test.Tasty
18
17
import Test.Tasty.HUnit
@@ -63,9 +62,11 @@ exampleConstraints =
63
62
(fn " bar" , False ),
64
63
(fn " baz" , True )]))
65
64
66
- , (" foo:happy:exe.template-haskell test" ,
67
- UserConstraint (UserExe (pn " foo" ) (pn " happy" )) (pn " template-haskell" )
68
- (PackagePropertyStanzas [TestStanzas ]))
65
+ -- -- TODO: Re-enable UserExe tests once we decide on a syntax.
66
+ --
67
+ -- , ("foo:happy:exe.template-haskell test",
68
+ -- UserConstraint (UserExe (pn "foo") (pn "happy")) (pn "template-haskell")
69
+ -- (PackagePropertyStanzas [TestStanzas]))
69
70
]
70
71
where
71
72
pn = mkPackageName
You can’t perform that action at this time.
0 commit comments