From e386a13c504f4a7348aca01464c57cdfb18ef6a0 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Wed, 13 Mar 2024 12:43:01 -0400 Subject: [PATCH] Add missing line at EOF for cabal-testsuite/**/*.hs - Fix whitespace in cabal-testsuite + other tests --- Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs | 4 ++-- cabal-install/tests/IntegrationTests2/.gitignore | 2 +- .../PackageTests/Backpack/Includes2/setup-per-component.test.hs | 2 +- cabal-testsuite/PackageTests/CmmSourcesExe/cmmexperiment.cabal | 1 - cabal-testsuite/PackageTests/ExternalCommandSetup/setup.cabal.hs | 1 - .../PackageTests/NewBuild/CmdRepl/CustomSetup/foo/Setup.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.dot-uv.test.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.dot-uv.v2.test.hs | 2 +- .../Projects-Default-No/cabal.ignore-project.test.hs | 2 +- .../Projects-Default-No/cabal.ignore-project.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.no-project.test.hs | 2 +- .../Projects-Default-No/cabal.no-project.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.sub-pq.test.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.sub-pq.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.sub-rs.test.hs | 2 +- .../Respect-Project-File/Projects-Default-No/cabal.sub-rs.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.v2.test.hs | 2 +- .../Projects-Default-Yes/cabal.ignore-project.test.hs | 2 +- .../Projects-Default-Yes/cabal.ignore-project.v2.test.hs | 2 +- .../Projects-Default-Yes/cabal.no-project.test.hs | 2 +- .../Projects-Default-Yes/cabal.no-project.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.project.test.hs | 2 +- .../Projects-Default-Yes/cabal.project.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.v2.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.test.hs | 2 +- .../Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.v2.test.hs | 2 +- cabal-testsuite/PackageTests/SDist/Respect-Project-File/README.md | 2 +- .../SDist/Respect-Project-File/cabal.ignore-project.test.hs | 2 +- .../SDist/Respect-Project-File/cabal.ignore-project.v2.test.hs | 2 +- .../PackageTests/SDist/Respect-Project-File/cabal.no-project.test.hs | 2 +- .../SDist/Respect-Project-File/cabal.no-project.v2.test.hs | 2 +- cabal-testsuite/PackageTests/VersionPriority/0-local.test.hs | 2 +- cabal-testsuite/PackageTests/VersionPriority/1-local.test.hs | 2 +- cabal-testsuite/PackageTests/VersionPriority/2-local.test.hs | 2 +- .../PackageTests/WarnEarlyOverwrite/clean-install-by-copy.test.hs | 2 +- .../PackageTests/WarnEarlyOverwrite/clean-install-by-symlink.test.hs | 2 +- cabal-testsuite/PackageTests/WarnEarlyOverwrite/dirty-install.test.hs | 2 +- 39 files changed, 38 insertions(+), 40 deletions(-) diff --git a/Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs b/Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs index 9fc9b3409..d66b2eb43 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Simple/Program/GHC.hs @@ -53,12 +53,12 @@ tests = testGroup "Distribution.Simple.Program.GHC" , compilerCompat = [] , compilerLanguages = [] , compilerExtensions = [] - , compilerProperties = Map.singleton "Support parallel --make" "YES" + , compilerProperties = Map.singleton "Support parallel --make" "YES" }) (Platform X86_64 Linux) (mempty { ghcOptNumJobs = Flag (NumJobs (Just 4)) }) assertListEquals flags ["-j4", "-clear-package-db"] - ] + ] ] assertListEquals :: (Eq a, Show a) => [a] -> [a] -> Assertion diff --git a/cabal-install/tests/IntegrationTests2/.gitignore b/cabal-install/tests/IntegrationTests2/.gitignore index ceb5549d4..7df6974cf 100644 --- a/cabal-install/tests/IntegrationTests2/.gitignore +++ b/cabal-install/tests/IntegrationTests2/.gitignore @@ -1 +1 @@ -config/default-config \ No newline at end of file +config/default-config diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs index e94d2018d..5bbb1b02a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs @@ -4,7 +4,7 @@ main = setupTest $ do skipUnlessGhcVersion ">= 8.1" ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*" expectBrokenIf ghc 7987 $ - withPackageDb $ + withPackageDb $ withDirectory "Includes2" $ do let setup_install' args = setup_install_with_docs args setup_install' ["mylib", "--cid", "mylib-0.1.0.0"] diff --git a/cabal-testsuite/PackageTests/CmmSourcesExe/cmmexperiment.cabal b/cabal-testsuite/PackageTests/CmmSourcesExe/cmmexperiment.cabal index b26391e6e..c07aa265b 100644 --- a/cabal-testsuite/PackageTests/CmmSourcesExe/cmmexperiment.cabal +++ b/cabal-testsuite/PackageTests/CmmSourcesExe/cmmexperiment.cabal @@ -20,4 +20,3 @@ executable demo else cmm-options: -ddump-cmm - diff --git a/cabal-testsuite/PackageTests/ExternalCommandSetup/setup.cabal.hs b/cabal-testsuite/PackageTests/ExternalCommandSetup/setup.cabal.hs index d6bea0400..7fb49a419 100644 --- a/cabal-testsuite/PackageTests/ExternalCommandSetup/setup.cabal.hs +++ b/cabal-testsuite/PackageTests/ExternalCommandSetup/setup.cabal.hs @@ -11,4 +11,3 @@ main = setupTest $ do res <- fails $ withDirectory "custom" $ setup' "aaaa" [] assertOutputContains "unrecognised command" res - diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/Setup.hs b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/Setup.hs index 4cfb12a55..5f30459ab 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/Setup.hs +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/Setup.hs @@ -5,4 +5,4 @@ import qualified Distribution.Simple as DS import Distribution.Simple.Setup main :: IO () -main = DS.defaultMainWithHooks DS.simpleUserHooks +main = DS.defaultMainWithHooks DS.simpleUserHooks diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.test.hs index 03f2535de..f45ed508b 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.test.hs @@ -9,4 +9,4 @@ import Test.Cabal.Prelude -- TODO: Fix this behaviour and apply the patch cabal.dot-uv.patch to update the -- expected output to what we'd expect if "cabal sdist" respected the project. main = cabalTest . withProjectFile "cabal.dot-uv.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.v2.test.hs index 5f6c3ba1a..c39feac79 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.dot-uv.project has "packages: .". That package is uv.cabal and "cabal -- v2-sdist" writes sdist/uv-0.1.tar.gz. This is correct. main = cabalTest . withProjectFile "cabal.dot-uv.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.test.hs index 6b77d12d2..90432e4fb 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.test.hs @@ -2,4 +2,4 @@ import Test.Cabal.Prelude -- This test correctly writes sdist/uv-0.1.tar.gz for the uv.cabal package. main = cabalTest $ do - cabal "sdist" ["all", "--ignore-project"] \ No newline at end of file + cabal "sdist" ["all", "--ignore-project"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.test.hs index a159257eb..94abd67e0 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.ignore-project.v2.test.hs @@ -5,4 +5,4 @@ import Test.Cabal.Prelude -- and wrote sdist/p-0.1.tar.gz. That is incorrect. It didn't ignore the -- project. main = cabalTest $ do - cabal "v2-sdist" ["all", "--ignore-project"] \ No newline at end of file + cabal "v2-sdist" ["all", "--ignore-project"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.test.hs index 0002f9f40..49bd8ecf7 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.test.hs @@ -6,4 +6,4 @@ import Test.Cabal.Prelude -- project probing would not occur and "cabal sdist" would work on the local -- uv.cabal package. main = cabalTest $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.test.hs index 5030fff51..6cdef3973 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.no-project.v2.test.hs @@ -6,4 +6,4 @@ import Test.Cabal.Prelude -- seen) is that project probing would not occur and "cabal v2-sdist" would work -- on the local uv.cabal package. main = cabalTest $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.test.hs index 194470441..8ad8bbd12 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.test.hs @@ -9,4 +9,4 @@ import Test.Cabal.Prelude -- TODO: Fix this behaviour and apply the patch cabal.sub-pq.patch to update the -- expected output to what we'd expect if "cabal sdist" respected the project. main = cabalTest . withProjectFile "cabal.sub-pq.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.v2.test.hs index aec079838..a82397a4e 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.sub-pq.project has "packages: p/ q/" and "cabal v2-sdist" writes -- sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. This is correct. main = cabalTest . withProjectFile "cabal.sub-pq.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.test.hs index 3dd58bf6b..d6ecf0631 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.test.hs @@ -9,4 +9,4 @@ import Test.Cabal.Prelude -- TODO: Fix this behaviour and apply the patch cabal.sub-rs.patch to update the -- expected output to what we'd expect if "cabal sdist" respected the project. main = cabalTest . withProjectFile "cabal.sub-rs.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.v2.test.hs index 66b8378a1..a0c14d196 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.sub-rs.project has "packages: r/ s/" and "cabal v2-sdist" writes -- sdist/r-0.1.tar.gz and sdist/s-0.1.tar.gz. This is correct. main = cabalTest . withProjectFile "cabal.sub-rs.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.test.hs index 7ca9d1fa2..3c0f776a7 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.test.hs @@ -9,4 +9,4 @@ import Test.Cabal.Prelude -- TODO: Fix this behaviour and apply the patch cabal.dot-uv.patch to update the -- expected output to what we'd expect if "cabal sdist" respected the project. main = cabalTest . withProjectFile "cabal.dot-uv.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.v2.test.hs index 2df773c55..4f12de028 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.dot-uv.project has "packages: .". That package is uv.cabal and "cabal -- v2-sdist" writes sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. That is correct. main = cabalTest . withProjectFile "cabal.dot-uv.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.test.hs index 6b77d12d2..90432e4fb 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.test.hs @@ -2,4 +2,4 @@ import Test.Cabal.Prelude -- This test correctly writes sdist/uv-0.1.tar.gz for the uv.cabal package. main = cabalTest $ do - cabal "sdist" ["all", "--ignore-project"] \ No newline at end of file + cabal "sdist" ["all", "--ignore-project"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.v2.test.hs index e98c7717e..d017d4731 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.ignore-project.v2.test.hs @@ -4,4 +4,4 @@ import Test.Cabal.Prelude -- sdist/uv-0.1.tar.gz for the uv.cabal package but instead it wrote -- sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. main = cabalTest $ do - cabal "v2-sdist" ["all", "--ignore-project"] \ No newline at end of file + cabal "v2-sdist" ["all", "--ignore-project"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.test.hs index 1699b269a..b25efe2a0 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.test.hs @@ -7,4 +7,4 @@ import Test.Cabal.Prelude -- TODO: Check that the code is behaving the same as it would have if -- "--project-file=cabal.project" was given or if it is using project probing. main = cabalTest $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.v2.test.hs index 10ffa0c5a..4f9189489 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.no-project.v2.test.hs @@ -4,4 +4,4 @@ import Test.Cabal.Prelude -- has "packages: p/ q/" and writes sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. -- This is correct. main = cabalTest $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.test.hs index 6be41cfc2..81b6cc511 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.test.hs @@ -4,4 +4,4 @@ import Test.Cabal.Prelude -- sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. This is correct but likely -- accidental as the default cabal.project has the same packages. main = cabalTest . withProjectFile "cabal.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.v2.test.hs index f94f478f6..29aafe0c9 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.project.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- The given cabal.project has has "packages: p/ q/" and "cabal v2-sdist" writes -- sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. This is correct. main = cabalTest . withProjectFile "cabal.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.test.hs index 92995d499..63803ba88 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.sub-pq.project has "packages: p/ q/" and "cabal sdist" writes -- sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. This is correct. main = cabalTest . withProjectFile "cabal.sub-pq.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.v2.test.hs index aec079838..a82397a4e 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-pq.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.sub-pq.project has "packages: p/ q/" and "cabal v2-sdist" writes -- sdist/p-0.1.tar.gz and sdist/q-0.1.tar.gz. This is correct. main = cabalTest . withProjectFile "cabal.sub-pq.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.test.hs index e20c7337d..e8977aa17 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.test.hs @@ -9,4 +9,4 @@ import Test.Cabal.Prelude -- TODO: Fix this behaviour and apply the patch cabal.sub-rs.patch to update the -- expected output to what we'd expect if "cabal sdist" respected the project. main = cabalTest . withProjectFile "cabal.sub-rs.project" $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.v2.test.hs index 239f91b1e..fa7bb0b26 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.v2.test.hs @@ -3,4 +3,4 @@ import Test.Cabal.Prelude -- cabal.sub-rs.project has "packages: r/ s/" and "cabal v2-sdist" writes -- sdist/r-0.1.tar.gz and sdist/s-0.1.tar.gz. That is correct. main = cabalTest . withProjectFile "cabal.sub-rs.project" $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/README.md b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/README.md index 0b3da4f90..e400102d3 100644 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/README.md +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/README.md @@ -51,7 +51,7 @@ with these tests. `cabal.project` instead; either the one one in the current directory or the one from the parent directory, one level up. I think this behaviour is wrong and the supplied `--project-file` option should be respected. - + Before I'd put a project there, one level up, the project probing had gone all the way up to Cabal's own `cabal.project` as can be seen by this diff after that change: diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.test.hs index 7d3628c2b..3145737a6 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.test.hs @@ -2,4 +2,4 @@ import Test.Cabal.Prelude -- This test correctly writes sdist/z-0.1.tar.gz for the z.cabal package. main = cabalTest $ do - cabal "sdist" ["all", "--ignore-project"] \ No newline at end of file + cabal "sdist" ["all", "--ignore-project"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.v2.test.hs index 7d3628c2b..3145737a6 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.ignore-project.v2.test.hs @@ -2,4 +2,4 @@ import Test.Cabal.Prelude -- This test correctly writes sdist/z-0.1.tar.gz for the z.cabal package. main = cabalTest $ do - cabal "sdist" ["all", "--ignore-project"] \ No newline at end of file + cabal "sdist" ["all", "--ignore-project"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.test.hs index defb9406c..8f440b78c 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.test.hs @@ -4,4 +4,4 @@ import Test.Cabal.Prelude -- has "packages: Projects-Default-No/p" and writes sdist/p-0.1.tar.gz. This is -- correct. main = cabalTest $ do - cabal "sdist" ["all"] \ No newline at end of file + cabal "sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.v2.test.hs b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.v2.test.hs index d86a67924..54cc62f96 100755 --- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.v2.test.hs +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/cabal.no-project.v2.test.hs @@ -4,4 +4,4 @@ import Test.Cabal.Prelude -- has "packages: Projects-Default-No/p" and writes sdist/p-0.1.tar.gz. This is -- correct. main = cabalTest $ do - cabal "v2-sdist" ["all"] \ No newline at end of file + cabal "v2-sdist" ["all"] diff --git a/cabal-testsuite/PackageTests/VersionPriority/0-local.test.hs b/cabal-testsuite/PackageTests/VersionPriority/0-local.test.hs index 07fe0af96..cb94faaa1 100644 --- a/cabal-testsuite/PackageTests/VersionPriority/0-local.test.hs +++ b/cabal-testsuite/PackageTests/VersionPriority/0-local.test.hs @@ -1,4 +1,4 @@ import Test.Cabal.Prelude main = cabalTest . withRepo "repo" . withProjectFile "0-local.project" $ do - fails $ cabal "v2-build" ["--dry-run"] \ No newline at end of file + fails $ cabal "v2-build" ["--dry-run"] diff --git a/cabal-testsuite/PackageTests/VersionPriority/1-local.test.hs b/cabal-testsuite/PackageTests/VersionPriority/1-local.test.hs index 14723adb0..2b19536eb 100644 --- a/cabal-testsuite/PackageTests/VersionPriority/1-local.test.hs +++ b/cabal-testsuite/PackageTests/VersionPriority/1-local.test.hs @@ -6,4 +6,4 @@ testVersionWin project = main = cabalTest . withRepo "repo" $ do testVersionWin "1-local-constraints-import.project" - testVersionWin "1-local-import-constraints.project" \ No newline at end of file + testVersionWin "1-local-import-constraints.project" diff --git a/cabal-testsuite/PackageTests/VersionPriority/2-local.test.hs b/cabal-testsuite/PackageTests/VersionPriority/2-local.test.hs index 4e4e61266..9289e16d0 100644 --- a/cabal-testsuite/PackageTests/VersionPriority/2-local.test.hs +++ b/cabal-testsuite/PackageTests/VersionPriority/2-local.test.hs @@ -6,4 +6,4 @@ testVersionWin project = main = cabalTest . withRepo "repo" $ do testVersionWin "2-local-constraints-import.project" - testVersionWin "2-local-import-constraints.project" \ No newline at end of file + testVersionWin "2-local-import-constraints.project" diff --git a/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-copy.test.hs b/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-copy.test.hs index af7d6f336..700421fce 100644 --- a/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-copy.test.hs +++ b/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-copy.test.hs @@ -10,4 +10,4 @@ main = withShorterPathForNewBuildStore $ \storeDir -> cabalTest $ do -- +Warning: The directory /incoming/new-2448/Users/RUNNER~1/AppData/Local/Temp/cabal-test-store-28260/ghc-/WarnEarlyOver_-0.1.0.0-4c19059e06a32b93b2812983631117e77a2d3833/bin is not in the system search path. -- +Copying 'warn-early-overwrite' to '' skipIfWindows - cabalG options "v2-install" ["--install-method=copy"] \ No newline at end of file + cabalG options "v2-install" ["--install-method=copy"] diff --git a/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-symlink.test.hs b/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-symlink.test.hs index 1fa303cb2..c2d12c0ca 100644 --- a/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-symlink.test.hs +++ b/cabal-testsuite/PackageTests/WarnEarlyOverwrite/clean-install-by-symlink.test.hs @@ -4,4 +4,4 @@ main = withShorterPathForNewBuildStore $ \storeDir -> cabalTest $ do -- The default install method is symlink that may not work on Windows. skipIfWindows let options = ["--store-dir=" ++ storeDir, "--installdir=" ++ storeDir] - cabalG options "v2-install" [] \ No newline at end of file + cabalG options "v2-install" [] diff --git a/cabal-testsuite/PackageTests/WarnEarlyOverwrite/dirty-install.test.hs b/cabal-testsuite/PackageTests/WarnEarlyOverwrite/dirty-install.test.hs index 6578a891c..c91ee226b 100644 --- a/cabal-testsuite/PackageTests/WarnEarlyOverwrite/dirty-install.test.hs +++ b/cabal-testsuite/PackageTests/WarnEarlyOverwrite/dirty-install.test.hs @@ -10,4 +10,4 @@ main = withShorterPathForNewBuildStore $ \storeDir -> cabalTest $ do -- Touch the target to see if the warning is made early before the build. _ <- runM "touch" [storeDir "warn-early-overwrite"] Nothing fails $ cabalG options "v2-install" [] - cabalG options "v2-install" ["--overwrite-policy=always"] \ No newline at end of file + cabalG options "v2-install" ["--overwrite-policy=always"] -- 2.11.4.GIT