diff options
| author | Krzysztof Gogolewski <krz.gogolewski@gmail.com> | 2018-11-22 11:32:55 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-11-22 12:11:16 -0500 |
| commit | 011e39d7fe533ca772beeed8529749c4750d4817 (patch) | |
| tree | 961d22d5ebc896bf20b03257eeeac4f908eac1b2 /testsuite/config | |
| parent | 13bb4bf44e6e690133be334bbf0c63fcae5db34a (diff) | |
| download | haskell-011e39d7fe533ca772beeed8529749c4750d4817.tar.gz | |
Fix GhostScript detection (Trac #15856)
The option `confdir` (used in GhostScript test) was set correctly
via `--config` in `test.mk` and incorrectly via `config/ghc`.
AFAICT, some time ago this was working because the
incorrect assignment was done first, and later it broke.
Hardian doesn't pass `confdir`. I removed `confdir` and use
`config.top` to determine the directory of the
`good.ps` and `bad.ps` files. This is simpler.
I also removed some redundant assignments in `config/ghc`.
Test Plan: manually set config.have_profiling and make test
Reviewers: bgamari
Subscribers: rwbarton, carter
GHC Trac Issues: #15856
Differential Revision: https://phabricator.haskell.org/D5298
Diffstat (limited to 'testsuite/config')
| -rw-r--r-- | testsuite/config/ghc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/testsuite/config/ghc b/testsuite/config/ghc index eae88ed145..247ddb8fd7 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -4,15 +4,8 @@ import re # # This file is Python source # -config.compiler = 'ghc' config.compiler_always_flags = ghc_compiler_always_flags.split() -config.haddock = 'haddock' -config.hp2ps = 'hp2ps' -config.hpc = 'hpc' -config.gs = 'gs' -config.confdir = '.' - # By default, the 'normal' and 'hpc' ways are enabled. In addition, certain # ways are enabled automatically if this GHC supports them. Ways that fall in # this group are 'optasm', 'optllvm', 'profasm', 'threaded1', 'threaded2', |