head 2025-01-02 16:24:04+00:00

bfrk · Jan 2, 2025 · b996cf2 · b996cf2
1 parent 22a3671
commit b996cf2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -29,7 +29,7 @@ jobs:
 #           - 9.8.2
           - 9.10.1
         cabal:
-          - '3.10'
+#           - '3.10'
           - '3.12'
         exclude:
           # building text-2.1.2 fails with obscure assembler error

diff --git a/harness/Darcs/Test/Shell.hs b/harness/Darcs/Test/Shell.hs
@@ -9,9 +9,11 @@ module Darcs.Test.Shell
     ) where
 
 import Darcs.Prelude
+import Darcs.Repository.Prefs ( globalCacheDir )
 
 import Control.Exception ( SomeException )
 import Data.List ( intercalate )
+import Data.Maybe ( fromJust )
 import Data.Tagged ( Tagged(..) )
 import Data.Text ( Text, pack, unpack )
 import qualified Data.Text as T
@@ -27,6 +29,7 @@ import Shelly
     , initOutputHandles
     , lastExitCode
     , lastStderr
+    , liftIO
     , mkdir
     , mkdir_p
     , onCommandHandles
@@ -104,6 +107,7 @@ runtest' ShellTest{..} srcdir =
   do
     wd <- pwd
     p  <- unpack <$> get_env_text "PATH"
+    cacheDir <- liftIO globalCacheDir
     let pathToUse =
           map (fromText . pack) $ takeDirectory darcspath : Native.splitSearchPath p
     let env =
@@ -113,6 +117,7 @@ runtest' ShellTest{..} srcdir =
           , ("TESTDATA", EnvFilePath (srcdir </> "tests" </> "data"))
           , ("TESTBIN", EnvFilePath (srcdir </> "tests" </> "bin"))
           , ("DARCS_TESTING_PREFS_DIR"   , EnvFilePath $ wd </> ".darcs")
+          , ("DARCS_TESTING_CACHE_DIR"   , EnvFilePath $ fromJust cacheDir)
           , ("EMAIL"                     , EnvString "tester")
           , ("GIT_AUTHOR_NAME"           , EnvString "tester")
           , ("GIT_AUTHOR_EMAIL"          , EnvString "tester")