Merge pull request haskell#10391 from MercuryTechnologies/wiggles/add…

…-repl-keep-temp-files-test-custom-setup Add `repl --keep-temp-files` test with custom `Setup.hs`
geekosaur · Oct 3, 2024 · 3667756 · 3667756
2 parents 5e3bb1a + 878a019
commit 3667756
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 0 deletions.
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.no.out b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.no.out
@@ -0,0 +1,11 @@
+# cabal clean
+# cabal v2-repl
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - pkg-a-1 (interactive) (first run)
+ - pkg-b-0 (interactive) (first run)
+Configuring pkg-a-1...
+Preprocessing library for pkg-a-1...
+Configuring pkg-b-0...
+Preprocessing library for pkg-b-0...
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.out b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.out
@@ -0,0 +1,10 @@
+# cabal v2-repl
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - pkg-a-1 (interactive) (lib) (first run)
+ - pkg-b-0 (interactive) (lib) (first run)
+Configuring library for pkg-a-1...
+Preprocessing library for pkg-a-1...
+Configuring library for pkg-b-0...
+Preprocessing library for pkg-b-0...
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.project b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.project
@@ -0,0 +1,2 @@
+packages: pkg-a/*.cabal
+packages: pkg-b/*.cabal
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.test.hs b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.test.hs
@@ -0,0 +1,33 @@
+import Test.Cabal.Prelude
+
+main = do
+  cabalTest' "yes" $ do
+    skipUnlessAnyCabalVersion ">= 3.11"
+    skipUnlessGhcVersion ">= 9.4"
+    cabal' "clean" []
+    res <-
+      cabalWithStdin
+        "v2-repl"
+        [ "--keep-temp-files"
+        , "--enable-multi-repl"
+        , "pkg-b"
+        , "pkg-a"
+        ]
+        "Bar.bar"
+    assertOutputContains "foo is 42" res
+    void $ assertGlobMatchesTestDir testDistDir "multi-out*/"
+
+  cabalTest' "no" $ do
+    skipUnlessAnyCabalVersion ">= 3.11"
+    skipUnlessGhcVersion ">= 9.4"
+    cabal' "clean" []
+    res <-
+      cabalWithStdin
+        "v2-repl"
+        [ "--enable-multi-repl"
+        , "pkg-b"
+        , "pkg-a"
+        ]
+        "Bar.bar"
+    assertOutputContains "foo is 42" res
+    void $ assertGlobDoesNotMatchTestDir testDistDir "multi-out*/"
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.yes.out b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/cabal.yes.out
@@ -0,0 +1,11 @@
+# cabal clean
+# cabal v2-repl
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - pkg-a-1 (interactive) (first run)
+ - pkg-b-0 (interactive) (first run)
+Configuring pkg-a-1...
+Preprocessing library for pkg-a-1...
+Configuring pkg-b-0...
+Preprocessing library for pkg-b-0...
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-a/Foo.hs b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-a/Foo.hs
@@ -0,0 +1,4 @@
+module Foo where
+
+foo :: Int
+foo = 42
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-a/Setup.hs b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-a/Setup.hs
@@ -0,0 +1,4 @@
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-a/pkg-a.cabal b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-a/pkg-a.cabal
@@ -0,0 +1,12 @@
+cabal-version: 2.2
+name: pkg-a
+version: 1
+build-type: Custom
+
+custom-setup
+  setup-depends: Cabal, base
+
+library
+  default-language: Haskell2010
+  build-depends: base
+  exposed-modules: Foo
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-b/Bar.hs b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-b/Bar.hs
@@ -0,0 +1,6 @@
+module Bar (foo, bar) where
+
+import Foo (foo)
+
+bar :: String
+bar = "foo is " <> show foo
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-b/Setup.hs b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-b/Setup.hs
@@ -0,0 +1,4 @@
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
diff --git a/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-b/pkg-b.cabal b/cabal-testsuite/PackageTests/MultiRepl/CustomSetupKeepTempFiles/pkg-b/pkg-b.cabal
@@ -0,0 +1,12 @@
+cabal-version: 2.2
+name: pkg-b
+version: 0
+build-type: Custom
+
+custom-setup
+  setup-depends: Cabal, base
+
+library
+  default-language: Haskell2010
+  build-depends: base, pkg-a
+  exposed-modules: Bar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		packages: pkg-a/*.cabal
		packages: pkg-b/*.cabal