Add alt.project tests for ReplOptions

philderbeast · philderbeast · commit 3821cff54289 · 2024-12-29T12:05:16.000-05:00
diff --git a/cabal-testsuite/PackageTests/ReplOptions/alt.project b/cabal-testsuite/PackageTests/ReplOptions/alt.project
@@ -0,0 +1 @@
+packages: alt
diff --git a/cabal-testsuite/PackageTests/ReplOptions/alt/ModuleA.hs b/cabal-testsuite/PackageTests/ReplOptions/alt/ModuleA.hs
@@ -0,0 +1,4 @@
+module ModuleA where
+
+a :: Int
+a = 42
diff --git a/cabal-testsuite/PackageTests/ReplOptions/alt/ModuleC.hs b/cabal-testsuite/PackageTests/ReplOptions/alt/ModuleC.hs
@@ -0,0 +1,4 @@
+module ModuleC where
+
+c :: Int
+c = 42
diff --git a/cabal-testsuite/PackageTests/ReplOptions/alt/alt.cabal b/cabal-testsuite/PackageTests/ReplOptions/alt/alt.cabal
@@ -0,0 +1,10 @@
+name: alt
+version: 0.1
+build-type: Simple
+cabal-version: >= 1.10
+
+library
+  exposed-modules: ModuleA, ModuleC
+  build-depends: base
+  default-language: Haskell2010
+
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.alt-multiple-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.alt-multiple-repl-options.out
@@ -0,0 +1,12 @@
+# cabal clean
+# cabal v2-repl
+Configuration is affected by the following files:
+- alt.project
+Configuration is affected by the following files:
+- alt.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - alt-0.1 (interactive) (lib) (first run)
+Configuring library for alt-0.1...
+Preprocessing library for alt-0.1...
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.alt-single-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.alt-single-repl-options.out
@@ -0,0 +1,12 @@
+# cabal clean
+# cabal v2-repl
+Configuration is affected by the following files:
+- alt.project
+Configuration is affected by the following files:
+- alt.project
+Resolving dependencies...
+Build profile: -w ghc-<GHCVER> -O1
+In order, the following will be built:
+ - alt-0.1 (interactive) (lib) (first run)
+Configuring library for alt-0.1...
+Preprocessing library for alt-0.1...
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options-multiple-flags.out
@@ -2,6 +2,8 @@
 # cabal v2-repl
 Configuration is affected by the following files:
 - cabal.project
+Configuration is affected by the following files:
+- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.multiple-repl-options.out
@@ -2,6 +2,8 @@
 # cabal v2-repl
 Configuration is affected by the following files:
 - cabal.project
+Configuration is affected by the following files:
+- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags-negative.out
@@ -2,6 +2,8 @@
 # cabal v2-repl
 Configuration is affected by the following files:
 - cabal.project
+Configuration is affected by the following files:
+- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options-multiple-flags.out
@@ -2,6 +2,8 @@
 # cabal v2-repl
 Configuration is affected by the following files:
 - cabal.project
+Configuration is affected by the following files:
+- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out b/cabal-testsuite/PackageTests/ReplOptions/cabal.single-repl-options.out
@@ -2,6 +2,8 @@
 # cabal v2-repl
 Configuration is affected by the following files:
 - cabal.project
+Configuration is affected by the following files:
+- cabal.project
 Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
diff --git a/cabal-testsuite/PackageTests/ReplOptions/cabal.test.hs b/cabal-testsuite/PackageTests/ReplOptions/cabal.test.hs
@@ -1,29 +1,46 @@
 import Test.Cabal.Prelude
 
+singleOpts = ["--repl-options=-fwrite-interface"]
+multiOpts = "--repl-options=-fdefer-typed-holes" : singleOpts
+altProject = ("--project-file=alt.project" :)
+
 main = do
   cabalTest' "single-repl-options" $ do
     cabal' "clean" []
-    res <- cabalWithStdin "v2-repl" ["--repl-options=-fwrite-interface"] ":set"
+    res <- cabalWithStdin "v2-repl" singleOpts ":set"
     assertOutputContains "Ok, two modules loaded." res
-    assertOutputContains "  -fwrite-interface" res
+
+  cabalTest' "alt-single-repl-options" $ do
+    cabal' "clean" []
+    -- Can we 'cabal repl' without a target when the project has a single package?
+    void $ cabalWithStdin "v2-repl" (altProject singleOpts) ":set"
+
   cabalTest' "multiple-repl-options" $ do
     cabal' "clean" []
-    res <- cabalWithStdin "v2-repl" ["--repl-options=-fwrite-interface", "--repl-options=-fdefer-typed-holes"] ":set"
+    res <- cabalWithStdin "v2-repl" multiOpts ":set"
     assertOutputContains "Ok, two modules loaded." res
     assertOutputContains "  -fwrite-interface" res
     assertOutputContains "  -fdefer-typed-holes" res
+
+  cabalTest' "alt-multiple-repl-options" $ do
+    cabal' "clean" []
+    -- Can we 'cabal repl' without a target when the project has a single package?
+    void $ cabalWithStdin "v2-repl" (altProject multiOpts) ":set"
+
   cabalTest' "single-repl-options-multiple-flags" $ do
     cabal' "clean" []
     res <- cabalWithStdin "v2-repl" ["--repl-options=-fdefer-typed-holes -fwrite-interface"] ":set"
     assertOutputContains "Ok, two modules loaded." res
     assertOutputContains "  -fwrite-interface" res
     assertOutputContains "  -fdefer-typed-holes" res
+
   cabalTest' "single-repl-options-multiple-flags-negative" $ do
     cabal' "clean" []
     res <- fails $ cabalWithStdin "v2-repl" ["--repl-options=-fwrite-interface -fdiagnostics-show-baret"] ":set"
     assertOutputDoesNotContain "Ok, two modules loaded." res
     assertOutputContains "unrecognised flag: -fdiagnostics-show-baret" res
     assertOutputContains "did you mean one of:" res
+
   cabalTest' "multiple-repl-options-multiple-flags" $ do
     cabal' "clean" []
     res <- cabalWithStdin "v2-repl" [

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +module ModuleA where
++
 +a :: Int
 +a = 42