[commit: ghc] master: Pass TEST_HC_OPTS in bug1465 and T5792. (a8406f8)

[git at git.haskell.org]

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

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

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

commit a8406f81a5da077d1c4b9995654ca9972f39130c
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Thu Sep 17 19:52:01 2015 -0700

    Pass TEST_HC_OPTS in bug1465 and T5792.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1250


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

a8406f81a5da077d1c4b9995654ca9972f39130c
 testsuite/tests/typecheck/bug1465/Makefile        | 2 +-
 testsuite/tests/typecheck/should_compile/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/typecheck/bug1465/Makefile b/testsuite/tests/typecheck/bug1465/Makefile
index 78cdd51..22fa477 100644
--- a/testsuite/tests/typecheck/bug1465/Makefile
+++ b/testsuite/tests/typecheck/bug1465/Makefile
@@ -28,6 +28,6 @@ prep:
 
 prep.%:
 	cd $* && '$(TEST_HC)' -v0 --make -o setup Setup.hs
-	cd $* && ./setup configure $(CABAL_MINIMAL_BUILD) -v0 --with-compiler='$(TEST_HC)' --with-ghc-pkg='$(GHC_PKG)' --package-db ../$(LOCAL_PKGCONF)
+	cd $* && ./setup configure $(CABAL_MINIMAL_BUILD) -v0 --with-compiler='$(TEST_HC)' --with-ghc-pkg='$(GHC_PKG)' --ghc-options='$(TEST_HC_OPTS)' --package-db ../$(LOCAL_PKGCONF)
 	cd $* && ./setup build -v0
 	cd $* && ./setup register -v0 --inplace
diff --git a/testsuite/tests/typecheck/should_compile/Makefile b/testsuite/tests/typecheck/should_compile/Makefile
index e361556..840254d 100644
--- a/testsuite/tests/typecheck/should_compile/Makefile
+++ b/testsuite/tests/typecheck/should_compile/Makefile
@@ -28,8 +28,8 @@ tc245:
 # presumably because of the .hi file
 T5792:
 	$(RM) -f T5792.o T5792.hi
-	'$(TEST_HC)' -c T5792.hs
-	'$(TEST_HC)' -c T5792.hs -fforce-recomp
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5792.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5792.hs -fforce-recomp
 
 T7171:
 	$(RM) -f T7171.hi-boot T7171.o-boot T7171a.hi T7171a.o