Merge pull request #9805 from alt-romes/wip/romes/9799-2

mergify[bot] · web-flow · commit d5f59e7aea46 · 2024-04-17T23:02:26.000Z
Add tests for #9799
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/Setup.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799a/Setup.hs
@@ -0,0 +1,2 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+main = _
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/T9799.cabal b/cabal-testsuite/PackageTests/NewFreeze/T9799a/T9799.cabal
@@ -0,0 +1,14 @@
+cabal-version:   3.0
+name:            T9799
+version:         0.1.0.0
+license:         NONE
+build-type:      Custom
+
+custom-setup
+    setup-depends: libA == 0.2.0.0
+
+library
+    exposed-modules:  MyLib
+    build-depends:    libA == 0.1.0.0
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/cabal.test.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799a/cabal.test.hs
@@ -0,0 +1,11 @@
+import Test.Cabal.Prelude
+main = cabalTest $ do
+  withRepo "repo" $ do
+    cabal "v2-freeze" []
+    cwd <- fmap testCurrentDir getTestEnv
+    -- Guarantee that freeze writes scope-qualified constraints, not 'any'
+    -- qualified constraints.
+    expectBroken 9799 $ do
+      assertFileDoesNotContain (cwd </> "cabal.project.freeze") "any.libA"
+      assertFileDoesContain (cwd </> "cabal.project.freeze") "libA == 0.1.0.0"
+      assertFileDoesContain (cwd </> "cabal.project.freeze") "setup.libA == 0.2.0.0"
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.1.0.0/libA.cabal b/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.1.0.0/libA.cabal
@@ -0,0 +1,10 @@
+cabal-version:   3.0
+name:            libA
+version:         0.1.0.0
+license:         NONE
+build-type:      Simple
+
+library
+    exposed-modules:  MyLib
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.1.0.0/src/MyLib.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.1.0.0/src/MyLib.hs
@@ -0,0 +1,4 @@
+module MyLib (someFunc) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.2.0.0/libA.cabal b/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.2.0.0/libA.cabal
@@ -0,0 +1,10 @@
+cabal-version:   3.0
+name:            libA
+version:         0.2.0.0
+license:         NONE
+build-type:      Simple
+
+library
+    exposed-modules:  MyLib
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.2.0.0/src/MyLib.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799a/repo/libA-0.2.0.0/src/MyLib.hs
@@ -0,0 +1,4 @@
+module MyLib (someFunc) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799a/src/MyLib.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799a/src/MyLib.hs
@@ -0,0 +1,4 @@
+module MyLib (someFunc) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/Setup.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799b/Setup.hs
@@ -0,0 +1,5 @@
+import MyLib
+import Distribution.Simple
+main = do
+  putStrLn $ "Setup: " ++ vers
+  defaultMain
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/T9799.cabal b/cabal-testsuite/PackageTests/NewFreeze/T9799b/T9799.cabal
@@ -0,0 +1,14 @@
+cabal-version:   3.0
+name:            T9799
+version:         0.1.0.0
+license:         NONE
+build-type:      Custom
+
+custom-setup
+    setup-depends: libA, base, Cabal
+
+library
+    exposed-modules:  None
+    build-depends:    libA, base, template-haskell
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/cabal.test.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799b/cabal.test.hs
@@ -0,0 +1,22 @@
+import Test.Cabal.Prelude
+main = cabalTest $ do
+  withRepo "repo" $ do
+
+    -- Show how using 'any' qualifiers always with relaxed bounds can violate that
+    --    cabal freeze --constraint=... && cabal build
+    -- should be equal to
+    --    cabal build --constraint=...
+    --
+    -- Therefore, the packages in a cabal.project.freeze file must be properly qualified
+
+    out1 <- cabal' "v2-build" ["--constraint=setup.libA == 0.1.0.0"]
+    assertOutputContains "Setup: libA-0.1.0.0" out1
+    assertOutputContains "Building: libA-0.2.0.0" out1
+
+    cabal "v2-freeze" ["--constraint=setup.libA == 0.1.0.0"]
+
+    expectBroken 9799 $ do -- fails when building
+      out2 <- cabal' "v2-build" []
+      -- After #9799 is fixed, these two lines should be changed to `assertOutputContains`
+      assertOutputDoesNotContain "Setup: libA-0.1.0.0" out2
+      assertOutputDoesNotContain "Building: libA-0.2.0.0" out2
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.1.0.0/libA.cabal b/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.1.0.0/libA.cabal
@@ -0,0 +1,11 @@
+cabal-version:   3.0
+name:            libA
+version:         0.1.0.0
+license:         NONE
+build-type:      Simple
+
+library
+    exposed-modules:  MyLib
+    build-depends:    base
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.1.0.0/src/MyLib.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.1.0.0/src/MyLib.hs
@@ -0,0 +1,4 @@
+module MyLib where
+
+vers :: String
+vers = "libA-0.1.0.0"
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.2.0.0/libA.cabal b/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.2.0.0/libA.cabal
@@ -0,0 +1,11 @@
+cabal-version:   3.0
+name:            libA
+version:         0.2.0.0
+license:         NONE
+build-type:      Simple
+
+library
+    exposed-modules:  MyLib
+    build-depends: base
+    hs-source-dirs:   src
+    default-language: Haskell2010
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.2.0.0/src/MyLib.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799b/repo/libA-0.2.0.0/src/MyLib.hs
@@ -0,0 +1,4 @@
+module MyLib where
+
+renamedVers :: String
+renamedVers = "libA-0.2.0.0"
diff --git a/cabal-testsuite/PackageTests/NewFreeze/T9799b/src/None.hs b/cabal-testsuite/PackageTests/NewFreeze/T9799b/src/None.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE TemplateHaskell #-}
+module None where
+
+import MyLib
+import Language.Haskell.TH
+
+$(do
+    runIO $ putStrLn $ "Building: " ++ renamedVers
+    [d| x = () |]
+ )

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+{-# LANGUAGE NoImplicitPrelude #-}`
	`2`	`+main = _`