diff options
| author | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2020-06-26 17:22:15 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-11-02 23:45:06 -0500 |
| commit | 4ce2f7d6e6a516173750b1d740f345e90992ffce (patch) | |
| tree | a85194834b11e035e2cbb14da3f1cbfe474b4d68 /hadrian | |
| parent | e63db32c7eb089985a1a7279a0a886a32d70ac0e (diff) | |
| download | haskell-4ce2f7d6e6a516173750b1d740f345e90992ffce.tar.gz | |
testsuite: Add --top flag to driver
This allows us to make `config.top` a proper Path. Previously it was a
str, which caused the Ghostscript detection logic to break.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index d2e98282a2..757e7963d9 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -102,6 +102,7 @@ runTestBuilderArgs = builder RunTest ? do -- TODO: set CABAL_MINIMAL_BUILD/CABAL_PLUGIN_BUILD mconcat [ arg $ "testsuite/driver/runtests.py" , pure [ "--rootdir=" ++ testdir | testdir <- rootdirs ] + , arg "--top", arg (top -/- "testsuite") , arg "-e", arg $ "windows=" ++ show windowsHost , arg "-e", arg $ "darwin=" ++ show osxHost , arg "-e", arg $ "config.local=False" @@ -129,7 +130,6 @@ runTestBuilderArgs = builder RunTest ? do , arg "-e", arg $ "config.ghc_dynamic_by_default=" ++ show hasDynamicByDefault , arg "-e", arg $ "config.ghc_dynamic=" ++ show hasDynamic - , arg "-e", arg $ "config.top=" ++ show (top -/- "testsuite") , arg "-e", arg $ "config.wordsize=" ++ show wordsize , arg "-e", arg $ "config.os=" ++ show os , arg "-e", arg $ "config.arch=" ++ show arch |