From 45f0555455f7384727d959954dc359d491f32ebf Mon Sep 17 00:00:00 2001 From: Matthew Pickering <matthewtpickering@gmail.com> Date: Wed, 7 Jul 2021 17:20:15 +0100 Subject: [PATCH] hadrian: Add exe suffix to executables in testsuite --- hadrian/src/Settings/Builders/RunTest.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 806c31473b31..3c918a28f7a8 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -192,12 +192,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"]) ] -- GitLab