Adjusting tests' output

4322ce74 · Patrick Augusto · mergify-bot · f657276d · 4322ce74 · 4322ce74
Commit 4322ce74 authored 3 years ago by Patrick Augusto Committed by mergify-bot 3 years ago
--- a/cabal-install/tests/UnitTests/Distribution/Client/Init/Golden.hs
+++ b/cabal-install/tests/UnitTests/Distribution/Client/Init/Golden.hs
@@ -271,24 +271,27 @@ goldenCabalTests v pkgIx srcDb = testGroup ".cabal file golden tests"

        (Right (ProjectSettings opts pkgDesc (Just libTarget) (Just exeTarget) (Just testTarget), _)) -> do
          let pkgFields = mkPkgDescription opts pkgDesc
+              commonStanza = mkCommonStanza opts
              libStanza  = mkLibStanza  opts $ libTarget {_libDependencies  = mangleBaseDep libTarget  _libDependencies}
              exeStanza  = mkExeStanza  opts $ exeTarget {_exeDependencies  = mangleBaseDep exeTarget  _exeDependencies}
              testStanza = mkTestStanza opts $ testTarget {_testDependencies = mangleBaseDep testTarget _testDependencies}

-          mkStanza $ pkgFields ++ [libStanza, exeStanza, testStanza]
+          mkStanza $ pkgFields ++ [commonStanza, libStanza, exeStanza, testStanza]

        (Right (ProjectSettings opts pkgDesc (Just libTarget) Nothing (Just testTarget), _)) -> do
          let pkgFields = mkPkgDescription opts pkgDesc
+              commonStanza = mkCommonStanza opts
              libStanza  = mkLibStanza  opts $ libTarget  {_libDependencies  = mangleBaseDep libTarget  _libDependencies}
              testStanza = mkTestStanza opts $ testTarget {_testDependencies = mangleBaseDep testTarget _testDependencies}

-          mkStanza $ pkgFields ++ [libStanza, testStanza]
+          mkStanza $ pkgFields ++ [commonStanza, libStanza, testStanza]
        
        (Right (ProjectSettings opts pkgDesc Nothing Nothing (Just testTarget), _)) -> do
          let pkgFields = mkPkgDescription opts pkgDesc
+              commonStanza = mkCommonStanza opts
              testStanza = mkTestStanza opts $ testTarget {_testDependencies = mangleBaseDep testTarget _testDependencies}
          
-          mkStanza $ pkgFields ++ [testStanza]
+          mkStanza $ pkgFields ++ [commonStanza, testStanza]

        (Right (ProjectSettings _ _ l e t, _)) -> assertFailure $
          show l ++ "\n" ++ show e ++ "\n" ++ show t

--- 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
@@ -20,7 +20,11 @@ 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
+
 library
+    import:           warnings
    exposed-modules:  MyLib

    -- Modules included in this library but not exported.
@@ -33,6 +37,7 @@ library
    default-language: Haskell98

 executable y
+    import:           warnings
    main-is:          Main.hs

    -- Modules included in this executable, other than Main.
@@ -48,6 +53,7 @@ executable y
    default-language: Haskell2010

 test-suite y-test
+    import:           warnings
    default-language: Haskell2010

    -- Modules included in this executable, other than Main.

--- 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
@@ -52,7 +52,13 @@ 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
+
 library
+    -- Import common warning flags.
+    import:           warnings
+
    -- Modules exported by the library.
    exposed-modules:  MyLib

@@ -72,6 +78,9 @@ library
    default-language: Haskell98

 executable y
+    -- Import common warning flags.
+    import:           warnings
+
    -- .hs or .lhs file containing the Main module.
    main-is:          Main.hs

@@ -93,6 +102,9 @@ executable y
    default-language: Haskell2010

 test-suite y-test
+    -- Import common warning flags.
+    import:           warnings
+
    -- Base language which the package is written in.
    default-language: Haskell2010


--- 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
@@ -20,7 +20,11 @@ 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
+
 library
+    import:           warnings
    exposed-modules:  MyLib

    -- Modules included in this library but not exported.
@@ -33,6 +37,7 @@ library
    default-language: Haskell98

 test-suite y-test
+    import:           warnings
    default-language: Haskell2010

    -- Modules included in this executable, other than Main.

--- 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
@@ -52,7 +52,13 @@ 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
+
 library
+    -- Import common warning flags.
+    import:           warnings
+
    -- Modules exported by the library.
    exposed-modules:  MyLib

@@ -72,6 +78,9 @@ library
    default-language: Haskell98

 test-suite y-test
+    -- Import common warning flags.
+    import:           warnings
+
    -- Base language which the package is written in.
    default-language: Haskell2010


--- 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
@@ -20,7 +20,11 @@ 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
+
 test-suite y-test
+    import:           warnings
    default-language: Haskell2010

    -- Modules included in this executable, other than Main.

--- 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
@@ -52,7 +52,13 @@ 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
+
 test-suite y-test
+    -- Import common warning flags.
+    import:           warnings
+
    -- Base language which the package is written in.
    default-language: Haskell2010


--- a/cabal-install/tests/fixtures/init/golden/exe/exe-build-tools-with-comments.golden
+++ b/cabal-install/tests/fixtures/init/golden/exe/exe-build-tools-with-comments.golden
 executable y
+    -- Import common warning flags.
+    import:             warnings
+
    -- .hs or .lhs file containing the Main module.
    main-is:            Main.hs


--- a/cabal-install/tests/fixtures/init/golden/exe/exe-minimal-no-comments.golden
+++ b/cabal-install/tests/fixtures/init/golden/exe/exe-minimal-no-comments.golden
 executable y
+    import:           warnings
    main-is:          Main.hs
    build-depends:    base
    hs-source-dirs:   exe

--- a/cabal-install/tests/fixtures/init/golden/exe/exe-simple-minimal-with-comments.golden
+++ b/cabal-install/tests/fixtures/init/golden/exe/exe-simple-minimal-with-comments.golden
 executable y
+    import:           warnings
    main-is:          Main.hs
    build-depends:    base
    hs-source-dirs:   exe

--- a/cabal-install/tests/fixtures/init/golden/exe/exe-with-comments.golden
+++ b/cabal-install/tests/fixtures/init/golden/exe/exe-with-comments.golden
 executable y
+    -- Import common warning flags.
+    import:           warnings
+
    -- .hs or .lhs file containing the Main module.
    main-is:          Main.hs


--- a/cabal-install/tests/fixtures/init/golden/exe/exe.golden
+++ b/cabal-install/tests/fixtures/init/golden/exe/exe.golden
 executable y
+    import:           warnings
    main-is:          Main.hs

    -- Modules included in this executable, other than Main.

--- 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
 library
+    -- Import common warning flags.
+    import:             warnings
+
    -- Modules exported by the library.
    exposed-modules:    MyLib


--- 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
 library
+    import:           warnings
    exposed-modules:  MyLib
    build-depends:    base
    hs-source-dirs:   src

--- 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
 library
+    import:           warnings
    exposed-modules:  MyLib
    build-depends:    base
    hs-source-dirs:   src

--- a/cabal-install/tests/fixtures/init/golden/lib/lib-simple.golden
+++ b/cabal-install/tests/fixtures/init/golden/lib/lib-simple.golden
 library
+    import:           warnings
    exposed-modules:  MyLib

    -- Modules included in this library but not exported.

--- a/cabal-install/tests/fixtures/init/golden/lib/lib-with-comments.golden
+++ b/cabal-install/tests/fixtures/init/golden/lib/lib-with-comments.golden
 library
+    -- Import common warning flags.
+    import:           warnings
+
    -- Modules exported by the library.
    exposed-modules:  MyLib


--- a/cabal-install/tests/fixtures/init/golden/lib/lib.golden
+++ b/cabal-install/tests/fixtures/init/golden/lib/lib.golden
 library
+    import:           warnings
    exposed-modules:  MyLib

    -- Modules included in this library but not exported.

--- a/cabal-install/tests/fixtures/init/golden/test/standalone-test-with-comments.golden
+++ b/cabal-install/tests/fixtures/init/golden/test/standalone-test-with-comments.golden
 test-suite y-test
+    -- Import common warning flags.
+    import:           warnings
+
    -- Base language which the package is written in.
    default-language: Haskell2010


--- a/cabal-install/tests/fixtures/init/golden/test/standalone-test.golden
+++ b/cabal-install/tests/fixtures/init/golden/test/standalone-test.golden
 test-suite y-test
+    import:           warnings
    default-language: Haskell2010

    -- Modules included in this executable, other than Main.