Make some tests robust against DEBUG compiler

Several tests were failing in DEBUG mode, but fixing this
was easy: just pass $(TEST_HC_OPTS) in the relevant
Makefiles.

8 files changed, 8 insertions, 8 deletions

diff --git a/testsuite/tests/cabal/T12733/Makefile b/testsuite/tests/cabal/T12733/Makefile
index 04de2ada62..03f4bfd03f 100644
--- a/testsuite/tests/cabal/T12733/Makefile
+++ b/testsuite/tests/cabal/T12733/Makefile
@@ -7,7 +7,7 @@ SETUP=../Setup -v0
 T12733: clean
 	$(MAKE) -s --no-print-directory clean
 	'$(GHC_PKG)' init tmp.d
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	cp p/P.hs.in1 p/P.hs
 	cd p && $(SETUP) clean
 	cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d
diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
index 8aff27e2df..fb73eae7fd 100644
--- a/testsuite/tests/cabal/cabal01/Makefile
+++ b/testsuite/tests/cabal/cabal01/Makefile
@@ -21,7 +21,7 @@ $(eval $(call canonicalise,PREFIX))
 
 cabal01:
 	$(MAKE) -s --no-print-directory clean
-	'$(TEST_HC)' --make -o setup Setup.lhs -v0
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -o setup Setup.lhs -v0
 
 	'$(GHC_PKG)' init local.db
 # We don't make use of -rtsopts in this test, and if it's enabled then
diff --git a/testsuite/tests/cabal/cabal03/Makefile b/testsuite/tests/cabal/cabal03/Makefile
index 93589e89b0..1e948cf7bf 100644
--- a/testsuite/tests/cabal/cabal03/Makefile
+++ b/testsuite/tests/cabal/cabal03/Makefile
@@ -18,7 +18,7 @@ SETUP=../Setup -v0
 cabal03: clean
 	$(MAKE) -s --no-print-directory clean
 	'$(GHC_PKG)' init tmp.d
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	cd p && $(SETUP) clean
 	cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force --ipid p-noopt
 	cd p && $(SETUP) build
diff --git a/testsuite/tests/cabal/cabal04/Makefile b/testsuite/tests/cabal/cabal04/Makefile
index 408a725717..e9366fa349 100644
--- a/testsuite/tests/cabal/cabal04/Makefile
+++ b/testsuite/tests/cabal/cabal04/Makefile
@@ -12,7 +12,7 @@ SETUP=./Setup -v0
 
 cabal04:
 	$(MAKE) -s --no-print-directory clean
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	$(SETUP) clean
 	$(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(filter-out -rtsopts,$(TEST_HC_OPTS))' $(VANILLA) $(PROF) $(DYN)
 	$(SETUP) build 2> err
diff --git a/testsuite/tests/cabal/cabal05/Makefile b/testsuite/tests/cabal/cabal05/Makefile
index 981ee6f91c..2651e35a67 100644
--- a/testsuite/tests/cabal/cabal05/Makefile
+++ b/testsuite/tests/cabal/cabal05/Makefile
@@ -29,7 +29,7 @@ SETUP = ../Setup -v0
 cabal05: clean
 	$(MAKE) -s --no-print-directory clean
 	'$(GHC_PKG)' init tmp.d
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	# build p
 	cd p && $(SETUP) clean
 	cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/$$pkgid'
diff --git a/testsuite/tests/cabal/cabal06/Makefile b/testsuite/tests/cabal/cabal06/Makefile
index c42c5fb24f..842378f64e 100644
--- a/testsuite/tests/cabal/cabal06/Makefile
+++ b/testsuite/tests/cabal/cabal06/Makefile
@@ -24,7 +24,7 @@ SETUP=../Setup -v0
 cabal06: clean
 	$(MAKE) -s --no-print-directory clean
 	'$(GHC_PKG)' init tmp.d
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	cd p-1.0 && $(SETUP) clean
 	cd p-1.0 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --prefix='$(PWD)/inst-a' --ghc-pkg-options='--enable-multi-instance'
 	cd p-1.0 && $(SETUP) build
diff --git a/testsuite/tests/cabal/cabal08/Makefile b/testsuite/tests/cabal/cabal08/Makefile
index fb217ef199..8b9a292ce8 100644
--- a/testsuite/tests/cabal/cabal08/Makefile
+++ b/testsuite/tests/cabal/cabal08/Makefile
@@ -9,7 +9,7 @@ cabal08: clean
 	$(MAKE) -s --no-print-directory clean
 	'$(GHC_PKG)' init tmp1.d
 	'$(GHC_PKG)' init tmp2.d
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	cd p1 && $(SETUP) clean
 	cd p1 && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp1.d --prefix='$(PWD)/inst-p1' --ipid="p-0.1-aaa"
 	cd p1 && $(SETUP) build
diff --git a/testsuite/tests/cabal/cabal09/Makefile b/testsuite/tests/cabal/cabal09/Makefile
index e89c2eaf55..68331c1472 100644
--- a/testsuite/tests/cabal/cabal09/Makefile
+++ b/testsuite/tests/cabal/cabal09/Makefile
@@ -9,7 +9,7 @@ SETUP = ./Setup -v0
 
 cabal09: clean
 	$(MAKE) clean
-	'$(TEST_HC)' -v0 --make Setup
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
 	$(SETUP) clean
 	$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)'
 	$(SETUP) build