Update golden tests

Kleidukos · Kleidukos · commit 0402d4884924 · 2025-12-05T14:12:17.000+01:00
diff --git a/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-and-exe-no-comments.golden b/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-and-exe-no-comments.golden
@@ -14,13 +14,18 @@ build-type:         Simple
 extra-doc-files:    CHANGELOG.md
 -- extra-source-files:
 
-common warnings
-    ghc-options: -Wall
+common extensions
+    default-language: GHC2021
+
+common ghc-options
+    ghc-options: -Wall -Widentities -Wcompat
+
+common rts-options
+    ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
 
 library
     import:           extensions
     import:           ghc-options
-    import:           rts-options
     exposed-modules:  MyLib
     -- other-modules:
     -- other-extensions:
diff --git a/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-and-exe-with-comments.golden b/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-and-exe-with-comments.golden
@@ -54,8 +54,14 @@ extra-doc-files:    CHANGELOG.md
 -- Extra source files to be distributed with the package, such as examples, or a tutorial module.
 -- extra-source-files:
 
-common warnings
-    ghc-options: -Wall
+common extensions
+    default-language: GHC2021
+
+common ghc-options
+    ghc-options: -Wall -Widentities -Wcompat
+
+common rts-options
+    ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
 
 library
     -- Common language extensions
@@ -64,9 +70,6 @@ library
     -- Common compiler warnings and optimisations
     import:           ghc-options
 
-    -- Common RTS options
-    import:           rts-options
-
     -- Modules exported by the library.
     exposed-modules:  MyLib
 
diff --git a/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-no-comments.golden b/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-no-comments.golden
@@ -14,13 +14,18 @@ build-type:         Simple
 extra-doc-files:    CHANGELOG.md
 -- extra-source-files:
 
-common warnings
-    ghc-options: -Wall
+common extensions
+    default-language: GHC2021
+
+common ghc-options
+    ghc-options: -Wall -Widentities -Wcompat
+
+common rts-options
+    ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
 
 library
     import:           extensions
     import:           ghc-options
-    import:           rts-options
     exposed-modules:  MyLib
     -- other-modules:
     -- other-extensions:
diff --git a/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-with-comments.golden b/cabal-install/tests/fixtures/init/golden/cabal/cabal-lib-with-comments.golden
@@ -54,8 +54,14 @@ extra-doc-files:    CHANGELOG.md
 -- Extra source files to be distributed with the package, such as examples, or a tutorial module.
 -- extra-source-files:
 
-common warnings
-    ghc-options: -Wall
+common extensions
+    default-language: GHC2021
+
+common ghc-options
+    ghc-options: -Wall -Widentities -Wcompat
+
+common rts-options
+    ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
 
 library
     -- Common language extensions
@@ -64,9 +70,6 @@ library
     -- Common compiler warnings and optimisations
     import:           ghc-options
 
-    -- Common RTS options
-    import:           rts-options
-
     -- Modules exported by the library.
     exposed-modules:  MyLib
 
diff --git a/cabal-install/tests/fixtures/init/golden/cabal/cabal-test-suite-no-comments.golden b/cabal-install/tests/fixtures/init/golden/cabal/cabal-test-suite-no-comments.golden
@@ -14,8 +14,14 @@ build-type:         Simple
 extra-doc-files:    CHANGELOG.md
 -- extra-source-files:
 
-common warnings
-    ghc-options: -Wall
+common extensions
+    default-language: GHC2021
+
+common ghc-options
+    ghc-options: -Wall -Widentities -Wcompat
+
+common rts-options
+    ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
 
 test-suite y-test
     import:           extensions
diff --git a/cabal-install/tests/fixtures/init/golden/cabal/cabal-test-suite-with-comments.golden b/cabal-install/tests/fixtures/init/golden/cabal/cabal-test-suite-with-comments.golden
@@ -54,8 +54,14 @@ extra-doc-files:    CHANGELOG.md
 -- Extra source files to be distributed with the package, such as examples, or a tutorial module.
 -- extra-source-files:
 
-common warnings
-    ghc-options: -Wall
+common extensions
+    default-language: GHC2021
+
+common ghc-options
+    ghc-options: -Wall -Widentities -Wcompat
+
+common rts-options
+    ghc-options: -rtsopts -threaded "-with-rtsopts=-N -T"
 
 test-suite y-test
     -- Common language extensions
diff --git a/cabal-install/tests/fixtures/init/golden/lib/lib-build-tools-with-comments.golden b/cabal-install/tests/fixtures/init/golden/lib/lib-build-tools-with-comments.golden
@@ -5,9 +5,6 @@ library
     -- Common compiler warnings and optimisations
     import:             ghc-options
 
-    -- Common RTS options
-    import:             rts-options
-
     -- Modules exported by the library.
     exposed-modules:    MyLib
 
diff --git a/cabal-install/tests/fixtures/init/golden/lib/lib-minimal-no-comments.golden b/cabal-install/tests/fixtures/init/golden/lib/lib-minimal-no-comments.golden
@@ -1,7 +1,6 @@
 library
     import:           extensions
     import:           ghc-options
-    import:           rts-options
     exposed-modules:  MyLib
     build-depends:    base
     hs-source-dirs:   src
diff --git a/cabal-install/tests/fixtures/init/golden/lib/lib-no-comments.golden b/cabal-install/tests/fixtures/init/golden/lib/lib-no-comments.golden
@@ -1,7 +1,6 @@
 library
     import:           extensions
     import:           ghc-options
-    import:           rts-options
     exposed-modules:  MyLib
     -- other-modules:
     -- other-extensions:
diff --git a/cabal-install/tests/fixtures/init/golden/lib/lib-simple-minimal-with-comments.golden b/cabal-install/tests/fixtures/init/golden/lib/lib-simple-minimal-with-comments.golden
@@ -1,7 +1,6 @@
 library
     import:           extensions
     import:           ghc-options
-    import:           rts-options
     exposed-modules:  MyLib
     build-depends:    base
     hs-source-dirs:   src
diff --git a/cabal-install/tests/fixtures/init/golden/lib/lib-simple-no-comments.golden b/cabal-install/tests/fixtures/init/golden/lib/lib-simple-no-comments.golden
@@ -1,7 +1,6 @@
 library
     import:           extensions
     import:           ghc-options
-    import:           rts-options
     exposed-modules:  MyLib
     -- other-modules:
     -- other-extensions:
diff --git a/cabal-install/tests/fixtures/init/golden/lib/lib-with-comments.golden b/cabal-install/tests/fixtures/init/golden/lib/lib-with-comments.golden
@@ -5,9 +5,6 @@ library
     -- Common compiler warnings and optimisations
     import:           ghc-options
 
-    -- Common RTS options
-    import:           rts-options
-
     -- Modules exported by the library.
     exposed-modules:  MyLib
 
