Merge pull request #6064 from commercialhaskell/test-cabal-sublibrary-dependency

Update cabal-sublibrary-dependency test

Author: mpilgrem

test/integration/tests/cabal-sublibrary-dependency/Main.hs

@@ -2,13 +2,16 @@ import Control.Monad (unless)
 import Data.List (isInfixOf)
 import StackTest
 
-main :: IO ()
-main = do
-  putStrLn "Disabled: CI doesn't have GHC 8.8.1"
-  {-
-  stackErrStderr ["build"] $ \str ->
-    let msg = "SubLibrary dependency is not supported, this will almost certainly fail" in
+-- This tests building two local packages, one of which depends on the other
+-- (subproject). The dependency has a library and a visible sub-library named
+-- sub, each of which exposes a module that exports a function.
 
-    unless (msg `isInfixOf` str) $
-    error $ "Expected a warning: \n" ++ show msg
-  -}
+main :: IO ()
+-- The '--install-ghc' flag is passed here, because etc/scripts/release.hs
+-- passes `--no-install-ghc` when `--alpine` is passed to its 'check' command.
+-- (See stack.yaml; using GHC 9.4.4.)
+main = stackErrStderr ["build", "--install-ghc"] $ \str ->
+  let msg = "SubLibrary dependency is not supported, this will almost \
+            \certainly fail."
+  in  unless (msg `isInfixOf` str) $
+        error $ "Expected a warning: \n" ++ show msg

test/integration/tests/cabal-sublibrary-dependency/files/files.cabal

@@ -1,4 +1,4 @@
-cabal-version:       3.0
+cabal-version:       3.8
 name:                files
 version:             0.1.0.0
 build-type:          Simple

test/integration/tests/cabal-sublibrary-dependency/files/src/Lib.hs

@@ -1,6 +1,11 @@
-module Lib 
+module Lib
   ( someFunc
   ) where
 
+import Subproject.Lib ( libFunc )
+import Subproject.SubLib ( subLibFunc )
+
 someFunc :: IO ()
-someFunc = putStrLn "someFunc"
+someFunc = do
+  libFunc
+  subLibFunc

test/integration/tests/cabal-sublibrary-dependency/files/src/Sub/Sub.hs

@@ -1,7 +1,4 @@
-resolver: nightly-2020-01-17
+resolver: nightly-2023-03-04 # GHC 9.4.4
 packages:
 - .
 - subproject
-extra-deps:
-- github: snoyberg/filelock
-  commit: 4f080496d8bf153fbe26e64d1f52cf73c7db25f6

test/integration/tests/cabal-sublibrary-dependency/files/stack.yaml

@@ -0,0 +1,6 @@
+module Subproject.Lib
+    ( libFunc
+    ) where
+
+libFunc :: IO ()
+libFunc = putStrLn "libFunc"

test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/Lib.hs

@@ -0,0 +1,6 @@
+module Subproject.SubLib
+    ( subLibFunc
+    ) where
+
+subLibFunc :: IO ()
+subLibFunc = putStrLn "subLibFunc"

test/integration/tests/cabal-sublibrary-dependency/files/subproject/src/SubLib.hs

@@ -1,16 +1,17 @@
+cabal-version:       3.8
 name:                subproject
 version:             0.1.0.0
 build-type:          Simple
-cabal-version:       >=1.10
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Lib
+  exposed-modules:     Subproject.Lib
   build-depends:       base >= 4.7 && < 5
   default-language:    Haskell2010
 
 library sub
+  visibility:          public
   hs-source-dirs:      src
-  exposed-modules:     SubLib
+  exposed-modules:     Subproject.SubLib
   build-depends:       base >= 4.7 && < 5
   default-language:    Haskell2010