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 /testsuite/mk | |
| 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 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 49c0062eed..64c8550ce7 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -256,13 +256,13 @@ endif RUNTEST_OPTS += \ --rootdir=. \ --config-file=$(CONFIG) \ + --top="$(TOP_ABS)" \ -e 'config.platform="$(TARGETPLATFORM)"' \ -e 'config.os="$(TargetOS_CPP)"' \ -e 'config.arch="$(TargetARCH_CPP)"' \ -e 'config.wordsize="$(WORDSIZE)"' \ -e 'config.timeout=int($(TIMEOUT)) or config.timeout' \ - -e 'config.exeext="$(exeext)"' \ - -e 'config.top="$(TOP_ABS)"' + -e 'config.exeext="$(exeext)"' # Wrap non-empty program paths in quotes, because they may contain spaces. Do # it here, so we don't have to (and don't forget to do it) in the .T test |