Review, document and conform further integration tests

tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageA/package.yaml

@@ -7,6 +7,6 @@ dependencies:
 - base
 
 executables:
-  myPackage:
+  myExe:
     source-dirs: app
     main: Main.hs

tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageB/package.yaml

@@ -7,6 +7,6 @@ dependencies:
 - base
 
 executables:
-  myPackage:
+  myExe:
     source-dirs: app
     main: Main.hs

tests/integration/tests/1198-multiple-exes-with-same-name/files/myPackageC/package.yaml

@@ -7,6 +7,6 @@ dependencies:
 - base
 
 executables:
-  myPackage:
+  myExe:
     source-dirs: app
     main: Main.hs

tests/integration/tests/1659-skip-component/Main.hs

@@ -6,5 +6,5 @@ import           StackTest
 
 main :: IO ()
 main = do
-  stack ["build", "--test", "--bench", "--skip", "failing-test", "--skip", "failing-bench", "--skip", "myPackage-failing"]
-  stack ["build", ":failing-test", ":failing-bench", ":myPackage", ":myPackage-failing", "--skip", "failing-test", "--skip", "failing-bench", "--skip", "myPackage-failing"]
+  stack ["build", "--test", "--bench", "--skip", "test-failing", "--skip", "bench-failing", "--skip", "myExe-failing"]
+  stack ["build", ":test-failing", ":bench-failing", ":myExe", ":myExe-failing", "--skip", "test-failing", "--skip", "bench-failing", "--skip", "myExe-failing"]

tests/integration/tests/1659-skip-component/files/package.yaml

@@ -10,19 +10,19 @@ library:
   source-dirs: src
 
 executables:
-  myPackage:
+  myExe:
     source-dirs: app
     main: Main.hs
-  myPackage-failing:
+  myExe-failing:
     source-dirs: app-failing
     main: Main.hs
 
 tests:
-  failing-test:
+  test-failing:
     source-dirs: test
-    main: Spec.hs
+    main: Main.hs
 
 benchmarks:
-  failing-bench:
+  bench-failing:
     source-dirs: bench
-    main: Bench.hs
+    main: Main.hs

tests/integration/tests/2195-depend-on-exe/files/myPackageA/package.yaml

@@ -7,6 +7,6 @@ dependencies:
 - base
 
 executables:
-  myPackageA:
+  myExeA:
     source-dirs: app
     main: Main.hs

tests/integration/tests/3315-multi-ghc-options/Main.hs

@@ -1,6 +1,10 @@
+-- Stack allows one or more GHC options to be specified on the command line.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3315
+
 import StackTest.Repl
 
 main :: IO ()
 main = do
-  stack ["build", "--ghc-options=-ddump-simpl -ddump-asm -DBAR -DBAZ"]
+  stack ["build", "--ghc-options=-ddump-simpl -ddump-asm -DVARIABLE_A -DVARIABLE_B"]
   stackRepl ["--ghc-options=-ddump-simpl -ddump-asm"] (pure ())

tests/integration/tests/3315-multi-ghc-options/files/.gitignore

@@ -0,0 +1 @@
+myPackage.cabal

tests/integration/tests/3520-revision-matching/files/package.yaml → tests/integration/tests/3315-multi-ghc-options/files/package.yaml

@@ -1,9 +1,10 @@
-name: issue3520
+spec-version: 0.36.0
+
+name: myPackage
 version: 0.1.0.0
 
 dependencies:
 - base
-- mtl
 
 library:
   source-dirs: src

tests/integration/tests/3315-multi-ghc-options/files/src/Lib.hs

@@ -5,12 +5,12 @@ module Lib where
 -- Avoid problems with CPP and HLint
 #ifndef __HLINT__
 
-#ifndef BAR
-#error BAR isn't defined
+#ifndef VARIABLE_A
+#error VARIABLE_A isn't defined
 #endif
 
-#ifndef BAZ
-#error BAZ isn't defined
+#ifndef VARIABLE_B
+#error VARIABLE_B isn't defined
 #endif
 
 #endif

tests/integration/tests/3315-multi-ghc-options/files/stack.yaml

@@ -1 +1 @@
-snapshot: lts-24.37
+snapshot: ghc-9.10.3

tests/integration/tests/3390-unbuildable-test/Main.hs

@@ -1,3 +1,7 @@
+-- Stack ignores test suites that are not buildable.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3390
+
 import StackTest
 
 main :: IO ()

tests/integration/tests/3390-unbuildable-test/files/.gitignore

@@ -0,0 +1 @@
+myPackage.cabal

tests/integration/tests/3390-unbuildable-test/files/package.yaml

@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+version: 0.1.0.0
+
+tests:
+  myTest:
+    source-dirs: test
+    main: Main.hs
+    buildable: false

tests/integration/tests/3431-precompiled-works/Main.hs

@@ -1,10 +1,14 @@
-import StackTest
-import Control.Monad
-import Data.List
+-- Stack uses pre-compiled immutable packages where it can.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3431
+
+import           Control.Monad ( unless )
+import           Data.List ( isInfixOf )
+import           StackTest
 
 main :: IO ()
 main = do
-    stack ["build", "random-1.1", "--stack-yaml", "custom1/stack.yaml"]
-    stackCheckStderr ["build", "random-1.1", "--stack-yaml", "custom2/stack.yaml"] $ \out -> do
-      print out
-      unless ("precompiled" `isInfixOf` out) $ error "Didn't use precompiled!"
+  stack ["build", "random-1.1", "--stack-yaml", "custom1/stack.yaml"]
+  stackCheckStderr ["build", "random-1.1", "--stack-yaml", "custom2/stack.yaml"] $ \out -> do
+    print out
+    unless ("precompiled" `isInfixOf` out) $ error "Didn't use precompiled!"

tests/integration/tests/3431-precompiled-works/files/custom1/custom1.yaml

@@ -1,4 +1,4 @@
-snapshot: ghc-9.10.3
 name: custom1
+snapshot: ghc-9.10.3
 packages:
 - acme-missiles-0.3

tests/integration/tests/3431-precompiled-works/files/custom2/custom2.yaml

@@ -1,4 +1,4 @@
-snapshot: ghc-9.10.3
 name: custom2
+snapshot: ghc-9.10.3
 packages:
 - acme-missiles-0.2

tests/integration/tests/3574-extra-dep-local/Main.hs

@@ -1,4 +1,9 @@
+-- Stack can target a local extra-dep and distinguishes local extra-deps from
+-- local packages, when applying GHC options to local packages.
+--
+-- See: https://github.com/commercialhaskell/stack/issues/3574
+
 import StackTest
 
 main :: IO ()
-main = stack ["build", "foo"]
+main = stack ["build", "myPackage"]

tests/integration/tests/3574-extra-dep-local/files/.gitignore

@@ -0,0 +1 @@
+myPackage.cabal

tests/integration/tests/3574-extra-dep-local/files/myPackage/package.yaml

@@ -0,0 +1,10 @@
+spec-version: 0.36.0
+
+name: myPackage
+version: 0.1.0.0
+
+dependencies:
+- base
+
+library:
+  source-dirs: src

tests/integration/tests/3574-extra-dep-local/files/myPackage/src/Lib.hs

@@ -0,0 +1 @@
+module Lib where

tests/integration/tests/3574-extra-dep-local/files/stack.yaml

@@ -3,7 +3,7 @@ snapshot: ghc-9.10.3
 packages: []
 
 extra-deps:
-- foo
+- myPackage
 
 ghc-options:
-  $locals: -bob
+  $locals: -dummy

tests/integration/tests/3591-cabal-warnings-once/Main.hs

@@ -1,10 +1,14 @@
-import StackTest
-import Data.List (isInfixOf)
+-- Stack warns about unknown fields in Cabal files, but only once.
+--
+-- https://github.com/commercialhaskell/stack/issues/3591
+
+import           Data.List ( isInfixOf )
+import           StackTest
 
 main :: IO ()
 main = do
   stackCheckStderr ["build", "--dry-run"] $ \str ->
-    case filter ("unknown-field-name" `isInfixOf`) (lines str) of
-      [] -> error "unknown-field-name didn't appear once"
+    case filter ("unknown-cabal-field-name" `isInfixOf`) (lines str) of
+      [] -> error "unknown-Cabal-field-name didn't appear once"
       [_] -> pure ()
-      _:_:_ -> error "unknown-field-name appeared multiple times"
+      _:_:_ -> error "unknown-Cabal-field-name appeared multiple times"

tests/integration/tests/3591-cabal-warnings-once/files/.gitignore

@@ -0,0 +1 @@
+myPackage.cabal