haskell · mergify · Sep 2, 2024 · Jul 23, 2024 · Jul 24, 2024 · Jul 24, 2024
diff --git a/Cabal-tests/lib/Test/Utils/TempTestDir.hs b/Cabal-tests/lib/Test/Utils/TempTestDir.hs
@@ -2,11 +2,12 @@
 
 module Test.Utils.TempTestDir
   ( withTestDir
+  , withTestDir'
   , removeDirectoryRecursiveHack
   ) where
 
 import Distribution.Compat.Internal.TempFile (createTempDirectory)
-import Distribution.Simple.Utils (warn)
+import Distribution.Simple.Utils (warn, TempFileOptions (..), defaultTempFileOptions)
 import Distribution.Verbosity
 
 import Control.Concurrent (threadDelay)
@@ -23,12 +24,26 @@ import qualified System.Info (os)
 -- | Much like 'withTemporaryDirectory' but with a number of hacks to make
 -- sure on windows that we can clean up the directory at the end.
 withTestDir :: (MonadIO m, MonadMask m) => Verbosity -> String -> (FilePath -> m a) -> m a
-withTestDir verbosity template action = do
-  systmpdir <- liftIO getTemporaryDirectory
+withTestDir verbosity template action = withTestDir' verbosity defaultTempFileOptions template action
+
+withTestDir' :: (MonadIO m, MonadMask m) => Verbosity -> TempFileOptions -> String -> (FilePath -> m a) -> m a
+withTestDir' verbosity tempFileOpts template action = do
+  systmpdir <-
+    -- MacOS returns /var/folders/... which is a symlink (/var -> /private/var),
+    -- so the test-suite struggles to make the build cwd-agnostic in particular
+    -- for the ShowBuildInfo tests. This canonicalizePath call makes it
+    -- /private/var/folders/... which will work.
+    liftIO $ canonicalizePath =<< getTemporaryDirectory
   bracket
     ( do { tmpRelDir <- liftIO $ createTempDirectory systmpdir template
          ; return $ systmpdir </> tmpRelDir } )
-    (liftIO . removeDirectoryRecursiveHack verbosity)
+    (liftIO
+      -- This ensures that the temp files are not deleted at the end of the test.
+      -- It replicates the behavior of @withTempDirectoryEx@.
+      . when (not (optKeepTempFiles tempFileOpts))
+      -- This is the bit that helps with Windows deleting all files.
+      . removeDirectoryRecursiveHack verbosity
+      )
     action
 
 -- | On Windows, file locks held by programs we run (in this case VCSs)

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.test.hs
@@ -2,7 +2,7 @@ import Test.Cabal.Prelude
 
 main = cabalTest $ do
     skipUnlessGhcVersion ">= 8.1"
-    expectBrokenIf isWindows 10191 $ withProjectFile "cabal.internal.project" $ do
+    expectBrokenIfWindowsCI 10191 $ withProjectFile "cabal.internal.project" $ do
         cabal "v2-build" ["exe"]
         withPlan $ do
             r <- runPlanExe' "I" "exe" []

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.test.hs
@@ -1,8 +1,7 @@
 import Test.Cabal.Prelude
 main = setupAndCabalTest $ do
   skipUnlessGhcVersion ">= 8.1"
-  ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*"
-  expectBrokenIf ghc 7987 $ do
+  expectBrokenIfGhc "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*" 7987 $ do
     withPackageDb $ do
       withDirectory "mylib" $ setup_install_with_docs ["--ipid", "mylib-0.1.0.0"]
       withDirectory "mysql" $ setup_install_with_docs ["--ipid", "mysql-0.1.0.0"]

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.test.hs
@@ -2,8 +2,7 @@ import Test.Cabal.Prelude
 main = setupTest $ do
   -- No cabal test because per-component is broken with it
   skipUnlessGhcVersion ">= 8.1"
-  ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*"
-  expectBrokenIf ghc 7987 $
+  expectBrokenIfGhc "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*" 7987 $
     withPackageDb $
       withDirectory "Includes2" $ do
         let setup_install' args = setup_install_with_docs args

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.test.hs
@@ -1,8 +1,8 @@
 import Test.Cabal.Prelude
 
 main = cabalTest $ do
-    ghcVer <- isGhcVersion ">= 9.10"
     skipUnlessGhcVersion ">= 8.1"
+    ghcVer <- isGhcVersion ">= 9.10"
     skipIf "Windows + 9.10.1 (#10191)" (isWindows && ghcVer)
     withProjectFile "cabal.external.project" $ do
         cabal "v2-build" ["exe"]

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.test.hs
@@ -2,7 +2,7 @@ import Test.Cabal.Prelude
 
 main = cabalTest $ do
     skipUnlessGhcVersion ">= 8.1"
-    expectBrokenIf isWindows 10191 $ withProjectFile "cabal.internal.project" $ do
+    expectBrokenIfWindowsCI 10191 $ withProjectFile "cabal.internal.project" $ do
         cabal "v2-build" ["exe"]
         withPlan $ do
             r <- runPlanExe' "I" "exe" []

diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.test.hs
@@ -3,8 +3,7 @@ import Data.List
 import qualified Data.Char as Char
 main = setupAndCabalTest $ do
   skipUnlessGhcVersion ">= 8.1"
-  ghc <- isGhcVersion "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*"
-  expectBrokenIf ghc 7987 $
+  expectBrokenIfGhc "== 9.0.2 || == 9.2.* || == 9.4.* || == 9.6.*" 7987 $
     withPackageDb $ do
       containers_id <- getIPID "containers"
       withDirectory "repo/sigs-0.1.0.0" $ setup_install_with_docs ["--ipid", "sigs-0.1.0.0"]
@@ -21,4 +20,3 @@ main = setupAndCabalTest $ do
       withDirectory "repo/exe-0.1.0.0" $ do
         setup_install []
         runExe' "exe" [] >>= assertOutputContains "fromList [(0,2),(2,4)]"
-
diff --git a/cabal-testsuite/PackageTests/Backpack/T4754/setup.test.hs b/cabal-testsuite/PackageTests/Backpack/T4754/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 main = setupAndCabalTest $ do
     skipUnlessGhcVersion ">= 8.1"
-    skipUnless "no profiling libs" =<< hasProfiledLibraries
+    skipIfNoProfiledLibraries
     setup "configure" ["--enable-profiling"]
     setup "build" []
diff --git a/cabal-testsuite/PackageTests/Backpack/T6385/cabal.test.hs b/cabal-testsuite/PackageTests/Backpack/T6385/cabal.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 main =
-  cabalTest $ expectBrokenIf isWindows 10191 $ withShorterPathForNewBuildStore $ do
+  cabalTest $ expectBrokenIfWindows 10191 $ withShorterPathForNewBuildStore $ do
     skipUnlessGhcVersion ">= 8.1"
     withRepo "repo" $ do
       cabal "v2-build" ["T6385"]
diff --git a/cabal-testsuite/PackageTests/CCompilerOverride/custom-cc-clang.bat b/cabal-testsuite/PackageTests/CCompilerOverride/custom-cc-clang.bat
@@ -1,11 +1,7 @@
 @echo OFF
 
-where /q clang.exe
-
-IF %ERRORLEVEL% EQU 0 (
-   call clang.exe -DNOERROR6 %*
-   EXIT /B %ERRORLEVEL%
-)
-
-ECHO "Cannot find C compiler"
-EXIT /B 1
+REM replace the libdir with the path to the compiler
+FOR /f "delims=" %%A in ('call ghc.exe --print-libdir') do set "var=%%A"
+setlocal EnableDelayedExpansion
+CALL !var:lib=mingw\bin\clang.exe! -DNOERROR6 %*
+EXIT /B %ERRORLEVEL%
diff --git a/cabal-testsuite/PackageTests/CCompilerOverride/custom-cc.bat b/cabal-testsuite/PackageTests/CCompilerOverride/custom-cc.bat
@@ -1,11 +1,7 @@
 @echo OFF
 
-where /q gcc.exe
-
-IF %ERRORLEVEL% EQU 0 (
-   call gcc.exe -DNOERROR6 %*
-   EXIT /B %ERRORLEVEL%
-)
-
-ECHO "Cannot find C compiler"
-EXIT /B 1
+REM replace the libdir with the path to the compiler
+FOR /f "delims=" %%A in ('call ghc.exe --print-libdir') do set "var=%%A"
+setlocal EnableDelayedExpansion
+CALL !var:lib=mingw\bin\gcc.exe! -DNOERROR6 %*
+EXIT /B %ERRORLEVEL%
diff --git a/cabal-testsuite/PackageTests/CmmSourcesDyn/setup.test.hs b/cabal-testsuite/PackageTests/CmmSourcesDyn/setup.test.hs
@@ -1,7 +1,7 @@
 import Test.Cabal.Prelude
 
 main = setupTest $ do
-    skipIf "ghc < 7.8" =<< isGhcVersion "< 7.8"
+    skipIfGhcVersion "< 7.8"
     setup "configure" []
     res <- setup' "build" []
     assertOutputContains "= Post common block elimination =" res
diff --git a/cabal-testsuite/PackageTests/CustomDep/cabal.project b/cabal-testsuite/PackageTests/CustomDep/cabal.project
diff --git a/cabal-testsuite/PackageTests/CustomDep/cabal.test.hs b/cabal-testsuite/PackageTests/CustomDep/cabal.test.hs
diff --git a/cabal-testsuite/PackageTests/CustomDep/client/B.hs b/cabal-testsuite/PackageTests/CustomDep/client/B.hs
diff --git a/cabal-testsuite/PackageTests/CustomDep/client/Setup.hs b/cabal-testsuite/PackageTests/CustomDep/client/Setup.hs
diff --git a/cabal-testsuite/PackageTests/CustomDep/client/client.cabal b/cabal-testsuite/PackageTests/CustomDep/client/client.cabal
diff --git a/cabal-testsuite/PackageTests/CustomDep/custom/A.hs b/cabal-testsuite/PackageTests/CustomDep/custom/A.hs
diff --git a/cabal-testsuite/PackageTests/CustomDep/custom/Setup.hs b/cabal-testsuite/PackageTests/CustomDep/custom/Setup.hs
diff --git a/cabal-testsuite/PackageTests/CustomDep/custom/custom.cabal b/cabal-testsuite/PackageTests/CustomDep/custom/custom.cabal
diff --git a/cabal-testsuite/PackageTests/CustomPlain/A.hs b/cabal-testsuite/PackageTests/CustomPlain/A.hs
diff --git a/cabal-testsuite/PackageTests/CustomPlain/Setup.hs b/cabal-testsuite/PackageTests/CustomPlain/Setup.hs
diff --git a/cabal-testsuite/PackageTests/CustomPlain/cabal.project b/cabal-testsuite/PackageTests/CustomPlain/cabal.project
diff --git a/cabal-testsuite/PackageTests/CustomPlain/cabal.test.hs b/cabal-testsuite/PackageTests/CustomPlain/cabal.test.hs
diff --git a/cabal-testsuite/PackageTests/CustomPlain/plain.cabal b/cabal-testsuite/PackageTests/CustomPlain/plain.cabal
diff --git a/cabal-testsuite/PackageTests/CustomPlain/setup.cabal.out b/cabal-testsuite/PackageTests/CustomPlain/setup.cabal.out
diff --git a/cabal-testsuite/PackageTests/CustomPlain/setup.out b/cabal-testsuite/PackageTests/CustomPlain/setup.out
diff --git a/cabal-testsuite/PackageTests/CustomPlain/setup.test.hs b/cabal-testsuite/PackageTests/CustomPlain/setup.test.hs
diff --git a/cabal-testsuite/PackageTests/GHCJS/BuildRunner/cabal.test.hs b/cabal-testsuite/PackageTests/GHCJS/BuildRunner/cabal.test.hs
@@ -1,7 +1,7 @@
 import Test.Cabal.Prelude
 
 main = do
-  cabalTest . expectBrokenIf isWindows 10179 . recordMode DoNotRecord $ do
+  cabalTest . expectBrokenIfWindows 10179 . recordMode DoNotRecord $ do
     cwd <- fmap testCurrentDir getTestEnv
     testInvokedWithBuildRunner cwd "test" []
     testInvokedWithBuildRunner cwd "run" ["ghcjs-exe"]

diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectory/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 
-main = setupAndCabalTest $ expectBrokenIf isWindows 10179 $ do
+main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
       env <- getTestEnv
       let cwd = testCurrentDir env
       ghc_path <- programPathM ghcProgram

diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryGhcVersion/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 
-main = setupAndCabalTest $ expectBrokenIf isWindows 10179 $ do
+main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
       env <- getTestEnv
       let cwd = testCurrentDir env
       ghc_path <- programPathM ghcProgram

diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SameDirectoryVersion/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 
-main = setupAndCabalTest $ expectBrokenIf isWindows 10179 $ do
+main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
       env <- getTestEnv
       let cwd = testCurrentDir env
       ghc_path <- programPathM ghcProgram

diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/Symlink/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 
-main = setupAndCabalTest $ expectBrokenIf isWindows 10179 $ do
+main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
     withSymlink "bin/ghc" "ghc" $ do
         env <- getTestEnv
         let cwd = testCurrentDir env

diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkGhcVersion/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 
-main = setupAndCabalTest $ expectBrokenIf isWindows 10179 $ do
+main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
     withSymlink "bin/ghc-7.10" "ghc" $ do
         env <- getTestEnv
         let cwd = testCurrentDir env

diff --git a/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/setup.test.hs b/cabal-testsuite/PackageTests/GhcPkgGuess/SymlinkVersion/setup.test.hs
@@ -1,6 +1,6 @@
 import Test.Cabal.Prelude
 
-main = setupAndCabalTest $ expectBrokenIf isWindows 10179 $ do
+main = setupAndCabalTest $ expectBrokenIfWindows 10179 $ do
     withSymlink "bin/ghc-7.10" "ghc" $ do
         env <- getTestEnv
         let cwd = testCurrentDir env

diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/Foo.hs b/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/Foo.hs
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/Main.hs b/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/Main.hs
diff --git a/...stsuite/PackageTests/InternalVersions/BuildDependsExtra/build-depends-extra-version.cabal b/...stsuite/PackageTests/InternalVersions/BuildDependsExtra/build-depends-extra-version.cabal
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.cabal.out b/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.cabal.out
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.out b/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.out
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.test.hs b/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.test.hs
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildToolDependsExtra/Foo.hs b/cabal-testsuite/PackageTests/InternalVersions/BuildToolDependsExtra/Foo.hs
diff --git a/cabal-testsuite/PackageTests/InternalVersions/BuildToolDependsExtra/Main.hs b/cabal-testsuite/PackageTests/InternalVersions/BuildToolDependsExtra/Main.hs