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/mk | |
| 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/mk')
| -rw-r--r-- | testsuite/mk/test.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index 65e897d849..6c995a4b88 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -25,8 +25,7 @@ export MAKE RUNTESTS = $(TOP)/driver/runtests.py COMPILER = ghc -CONFIGDIR = $(TOP)/config -CONFIG = $(CONFIGDIR)/$(COMPILER) +CONFIG = $(TOP)/config/$(COMPILER) ifeq "$(GhcUnregisterised)" "YES" # Otherwise C backend generates many warnings about @@ -243,7 +242,6 @@ endif RUNTEST_OPTS += \ --rootdir=. \ --config-file=$(CONFIG) \ - -e 'config.confdir="$(CONFIGDIR)"' \ -e 'config.platform="$(TARGETPLATFORM)"' \ -e 'config.os="$(TargetOS_CPP)"' \ -e 'config.arch="$(TargetARCH_CPP)"' \ |