diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-07-07 17:20:15 +0100 |
|---|---|---|
| committer | Zubin <zubin.duggal@gmail.com> | 2021-10-12 06:43:25 +0000 |
| commit | 5a6255934a26e32c7ea696af1dc12ddb504db862 (patch) | |
| tree | 636dada81570b8c95eadb36ef0adb8235ffd1172 | |
| parent | 9813a04442e83820547afb8ad0bbb7355074ec86 (diff) | |
| download | haskell-5a6255934a26e32c7ea696af1dc12ddb504db862.tar.gz | |
hadrian: Add exe suffix to executables in testsuite
(cherry picked from commit 45f0555455f7384727d959954dc359d491f32ebf)
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 3c42284152..6e04e56c34 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -185,12 +185,12 @@ getTestArgs = do Just verbosity -> Just $ "--verbose=" ++ verbosity wayArgs = map ("--way=" ++) (testWays args) compilerArg = ["--config", "compiler=" ++ show (compiler)] - ghcPkgArg = ["--config", "ghc_pkg=" ++ show (bindir -/- "ghc-pkg")] + ghcPkgArg = ["--config", "ghc_pkg=" ++ show (bindir -/- "ghc-pkg" <.> exe)] haddockArg = if haveDocs - then [ "--config", "haddock=" ++ show (bindir -/- "haddock") ] + then [ "--config", "haddock=" ++ show (bindir -/- "haddock" <.> exe) ] else [ "--config", "haddock=" ] - hp2psArg = ["--config", "hp2ps=" ++ show (bindir -/- "hp2ps")] - hpcArg = ["--config", "hpc=" ++ show (bindir -/- "hpc")] + hp2psArg = ["--config", "hp2ps=" ++ show (bindir -/- "hp2ps" <.> exe)] + hpcArg = ["--config", "hpc=" ++ show (bindir -/- "hpc" <.> exe)] inTreeArg = [ "-e", "config.in_tree_compiler=" ++ show (testCompiler args `elem` ["stage1", "stage2", "stage3"]) ] |