summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlp Mestanogullari <alp@well-typed.com>2018-09-04 19:09:06 +0200
committerKrzysztof Gogolewski <krz.gogolewski@gmail.com>2018-09-04 19:10:07 +0200
commit2254912036597cee3f1c2544320a35d1115c1e6e (patch)
tree49b732705851366b71901a55ddaf82539a776cb9
parenta3a1a17ba7ddbc40b093c732e7e3a916b9531eac (diff)
downloadhaskell-2254912036597cee3f1c2544320a35d1115c1e6e.tar.gz
testsuite: make CHECK_API_ANNOTATIONS and CHECK_PPR overridable
Summary: Without this patch, boilerplate.mk (which is included by a lot of Makefiles from our testsuite) just assumes they reside in the usual inplace directory, which is not friendly to hadrian and this makes a lot of tests (e.g T10255) fail when building GHC and running the testsuite with hadrian. With this patch, the said tests pass. Test Plan: api annotation tests (with hadrian) Reviewers: bgamari, monoidal Reviewed By: monoidal Subscribers: rwbarton, carter Differential Revision: https://phabricator.haskell.org/D5127
-rw-r--r--testsuite/mk/boilerplate.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk
index c38bf854fa..4c32f30ee2 100644
--- a/testsuite/mk/boilerplate.mk
+++ b/testsuite/mk/boilerplate.mk
@@ -219,8 +219,14 @@ CP = cp
RM = rm -f
PYTHON = python3
+ifeq "$(CHECK_API_ANNOTATIONS)" ""
CHECK_API_ANNOTATIONS := $(abspath $(TOP)/../inplace/bin/check-api-annotations)
-CHECK_PPR := $(abspath $(TOP)/../inplace/bin/check-ppr)
+endif
+
+ifeq "$(CHECK_PPR)" ""
+CHECK_PPR := $(abspath $(TOP)/../inplace/bin/check-ppr)
+endif
+
# -----------------------------------------------------------------------------
# configuration of TEST_HC