Commit 59f79433 authored by Edward Z. Yang's avatar Edward Z. Yang
Browse files

Swap from testWorkDir to testDistDir for cabal builddir.



Signed-off-by: default avatarEdward Z. Yang <ezyang@cs.stanford.edu>
parent 42e90187
......@@ -228,10 +228,10 @@ cabal' cmd args = do
= [ ]
-- new-build commands are affected by testCabalProjectFile
| "new-" `isPrefixOf` cmd
= [ "--builddir", testWorkDir env
= [ "--builddir", testDistDir env
, "--project-file", testCabalProjectFile env ]
| otherwise
= [ "--builddir", testWorkDir env ]
= [ "--builddir", testDistDir env ]
global_args
| testHaveSandbox env
= [ "--sandbox-config-file", testSandboxConfigFile env ]
......@@ -284,7 +284,7 @@ withPlan :: TestM a -> TestM a
withPlan m = do
env0 <- getTestEnv
Just plan <- JSON.decode `fmap`
liftIO (BSL.readFile (testWorkDir env0 </> "cache" </> "plan.json"))
liftIO (BSL.readFile (testDistDir env0 </> "cache" </> "plan.json"))
withReaderT (\env -> env { testPlan = Just plan }) m
-- | Run an executable from a package. Requires 'withPlan' to have
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment