Commit cb2d836c authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Pass '--builddir' to 'test' when running 'install --enable-tests'.

parent 4102b0d2
......@@ -102,7 +102,7 @@ import Distribution.Simple.Setup
, buildCommand, BuildFlags(..), emptyBuildFlags
, toFlag, fromFlag, fromFlagOrDefault, flagToMaybe )
import qualified Distribution.Simple.Setup as Cabal
( installCommand, InstallFlags(..), emptyInstallFlags
( installCommand, InstallFlags(..), TestFlags(..), emptyInstallFlags
, emptyTestFlags, testCommand, Flag(..) )
import Distribution.Simple.Utils
( rawSystemExit, comparing, writeFileAtomic )
......@@ -1206,7 +1206,9 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
haddockVerbosity = toFlag verbosity'
}
testsEnabled = fromFlag (configTests configFlags)
testFlags _ = Cabal.emptyTestFlags
testFlags _ = Cabal.emptyTestFlags {
Cabal.testDistPref = configDistPref configFlags
}
installFlags _ = Cabal.emptyInstallFlags {
Cabal.installDistPref = configDistPref configFlags,
Cabal.installVerbosity = toFlag verbosity'
......
Markdown is supported
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