[commit: ghc] master: testsuite: make CHECK_API_ANNOTATIONS and CHECK_PPR overridable (2254912)

git at git.haskell.org git at git.haskell.org
Tue Sep 4 17:10:47 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2254912036597cee3f1c2544320a35d1115c1e6e/ghc

>---------------------------------------------------------------

commit 2254912036597cee3f1c2544320a35d1115c1e6e
Author: Alp Mestanogullari <alp at well-typed.com>
Date:   Tue Sep 4 19:09:06 2018 +0200

    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


>---------------------------------------------------------------

2254912036597cee3f1c2544320a35d1115c1e6e
 testsuite/mk/boilerplate.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk
index c38bf85..4c32f30 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



More information about the ghc-commits mailing list