[commit: ghc] ghc-8.0: Fix failures of T12031 (3308b30)

git at git.haskell.org git at git.haskell.org
Wed Aug 31 23:23:51 UTC 2016


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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/3308b30be6a5eef71039923e94f11d9809671ca2/ghc

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

commit 3308b30be6a5eef71039923e94f11d9809671ca2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Aug 31 14:12:06 2016 -0400

    Fix failures of T12031
    
    TEST_HC_OPTS_INTERACTIVE was not defined due to an inconsistent
    cherry-pick. In master this was done in
    bdc555885b8898684549eca70053c9ce0ec7fa39 but I opted to simply extract
    the relevant definition from this commit in the interest of simplicity.


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

3308b30be6a5eef71039923e94f11d9809671ca2
 testsuite/mk/test.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk
index 6379a16..127d081 100644
--- a/testsuite/mk/test.mk
+++ b/testsuite/mk/test.mk
@@ -50,6 +50,8 @@ ifeq "$(MinGhcVersion711)" "YES"
 TEST_HC_OPTS += -fno-warn-missed-specialisations
 endif
 
+TEST_HC_OPTS_INTERACTIVE = $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci
+
 RUNTEST_OPTS =
 
 ifeq "$(filter $(TargetOS_CPP), cygwin32 mingw32)" ""



More information about the ghc-commits mailing list