Fix MacOS canonical paths

haskell · Jul 25, 2024 · 4285454 · 4285454
1 parent f364868
commit 4285454
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Cabal-tests/lib/Test/Utils/TempTestDir.hs b/Cabal-tests/lib/Test/Utils/TempTestDir.hs
@@ -28,7 +28,12 @@ withTestDir verbosity template action = withTestDir' verbosity defaultTempFileOp
 
 withTestDir' :: (MonadIO m, MonadMask m) => Verbosity -> TempFileOptions -> String -> (FilePath -> m a) -> m a
 withTestDir' verbosity tempFileOpts template action = do
-  systmpdir <- liftIO getTemporaryDirectory
+  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 } )