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/driver/testlib.py | |
| 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/driver/testlib.py')
| -rw-r--r-- | testsuite/driver/testlib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index 761ba67fd2..b2f14d1d28 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -1921,9 +1921,9 @@ global gs_working gs_working = False if config.have_profiling: if config.gs != '': - resultGood = runCmd(genGSCmd(config.confdir + '/good.ps')); + resultGood = runCmd(genGSCmd(config.top + '/config/good.ps')); if resultGood == 0: - resultBad = runCmd(genGSCmd(config.confdir + '/bad.ps') + + resultBad = runCmd(genGSCmd(config.top + '/config/bad.ps') + ' >/dev/null 2>&1') if resultBad != 0: print("GhostScript available for hp2ps tests") |