summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorRichard Eisenberg <rae@cs.brynmawr.edu>2018-07-12 16:21:54 -0400
committerRichard Eisenberg <rae@cs.brynmawr.edu>2018-07-14 21:23:30 -0400
commitb7d60022bfcfdeb5e27ba5a0575b2c229b36e21b (patch)
treed25c6ecbc2e468910b0c784ff5520b29afce667f /testsuite
parenta754a420b53cd2210ef60dcd695bf3334af2e400 (diff)
downloadhaskell-b7d60022bfcfdeb5e27ba5a0575b2c229b36e21b.tar.gz
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.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/backpack/cabal/T14304/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal01/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal02/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal03/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal04/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal05/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal06/Makefile2
-rw-r--r--testsuite/tests/backpack/cabal/bkpcabal07/Makefile2
-rw-r--r--testsuite/tests/cabal/T12733/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal01/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal03/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal04/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal05/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal06/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal08/Makefile2
-rw-r--r--testsuite/tests/cabal/cabal09/Makefile2
-rw-r--r--testsuite/tests/driver/T3007/Makefile4
-rw-r--r--testsuite/tests/patsyn/should_compile/T13350/Makefile2
-rw-r--r--testsuite/tests/safeHaskell/check/pkg01/Makefile18
-rw-r--r--testsuite/tests/typecheck/T13168/Makefile2
-rw-r--r--testsuite/tests/typecheck/bug1465/Makefile2
21 files changed, 30 insertions, 30 deletions
diff --git a/testsuite/tests/backpack/cabal/T14304/Makefile b/testsuite/tests/backpack/cabal/T14304/Makefile
index 1f58184198..6f2394ff47 100644
--- a/testsuite/tests/backpack/cabal/T14304/Makefile
+++ b/testsuite/tests/backpack/cabal/T14304/Makefile
@@ -8,7 +8,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
T14304: 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
# typecheck indef
rm -rf indef/dist
(cd indef; $(CONFIGURE) --ipid "indef-0.1")
diff --git a/testsuite/tests/backpack/cabal/bkpcabal01/Makefile b/testsuite/tests/backpack/cabal/bkpcabal01/Makefile
index e67707f645..01744dae01 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal01/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal01/Makefile
@@ -8,7 +8,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal01: 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
cp q/Q.hs.in1 q/Q.hs
# typecheck p
diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/Makefile b/testsuite/tests/backpack/cabal/bkpcabal02/Makefile
index 4856c2ca5b..3fd073ac1c 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal02/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal02/Makefile
@@ -8,7 +8,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal02: 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
# Here is a working signature which this
# package can typecheck with
cp p/H.hsig.in1 p/H.hsig
diff --git a/testsuite/tests/backpack/cabal/bkpcabal03/Makefile b/testsuite/tests/backpack/cabal/bkpcabal03/Makefile
index d5c39e4a21..5521264ead 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal03/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal03/Makefile
@@ -8,7 +8,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal03: 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 bkpcabal03.cabal.in1 bkpcabal03.cabal
# typecheck asig1
(cd asig1; $(CONFIGURE) --cid "asig1" asig1)
diff --git a/testsuite/tests/backpack/cabal/bkpcabal04/Makefile b/testsuite/tests/backpack/cabal/bkpcabal04/Makefile
index 0e81107d9e..dd50e61bd4 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal04/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal04/Makefile
@@ -8,7 +8,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal04: 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 bkpcabal04.cabal.in1 bkpcabal04.cabal
cp q/B.hsig.in q/B.hsig
# typecheck
diff --git a/testsuite/tests/backpack/cabal/bkpcabal05/Makefile b/testsuite/tests/backpack/cabal/bkpcabal05/Makefile
index b5a7fa5db1..0679feee6a 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal05/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal05/Makefile
@@ -12,7 +12,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal05: 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
$(CONFIGURE)
cp A.hsig.in1 A.hsig
# typecheck
diff --git a/testsuite/tests/backpack/cabal/bkpcabal06/Makefile b/testsuite/tests/backpack/cabal/bkpcabal06/Makefile
index 29f1456e63..aa379dc2c4 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal06/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal06/Makefile
@@ -12,7 +12,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal06: 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
$(CONFIGURE)
cp impl/P.hs.in1 impl/P.hs
$(SETUP) build
diff --git a/testsuite/tests/backpack/cabal/bkpcabal07/Makefile b/testsuite/tests/backpack/cabal/bkpcabal07/Makefile
index a83f4b9128..346ac32219 100644
--- a/testsuite/tests/backpack/cabal/bkpcabal07/Makefile
+++ b/testsuite/tests/backpack/cabal/bkpcabal07/Makefile
@@ -11,7 +11,7 @@ CONFIGURE=$(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --gh
bkpcabal07: 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
$(CONFIGURE)
$(SETUP) build
ifneq "$(CLEANUP)" ""
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
diff --git a/testsuite/tests/driver/T3007/Makefile b/testsuite/tests/driver/T3007/Makefile
index 09db27a38f..52b3331af1 100644
--- a/testsuite/tests/driver/T3007/Makefile
+++ b/testsuite/tests/driver/T3007/Makefile
@@ -11,11 +11,11 @@ clean:
T3007:
$(MAKE) -s --no-print-directory clean
'$(GHC_PKG)' init package.conf
- cd A && '$(TEST_HC)' -v0 --make Setup
+ cd A && '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-option=-package-db../package.conf
cd A && ./Setup build -v0
cd A && ./Setup register --inplace -v0
- cd B && '$(TEST_HC)' -v0 --make Setup
+ cd B && '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Setup
cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-option=-package-db../package.conf
cd B && ./Setup build -v0
diff --git a/testsuite/tests/patsyn/should_compile/T13350/Makefile b/testsuite/tests/patsyn/should_compile/T13350/Makefile
index ffd584a2a3..d3a42e46a9 100644
--- a/testsuite/tests/patsyn/should_compile/T13350/Makefile
+++ b/testsuite/tests/patsyn/should_compile/T13350/Makefile
@@ -6,7 +6,7 @@ LOCAL_PKGCONF=local.package.conf
T13350:
"$(GHC_PKG)" init $(LOCAL_PKGCONF)
- cd boolean && "$(TEST_HC)" -v0 --make Setup.hs
+ cd boolean && "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make Setup.hs
cd boolean && ./Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
cd boolean && ./Setup build -v0
cd boolean && ./Setup register -v0 --inplace
diff --git a/testsuite/tests/safeHaskell/check/pkg01/Makefile b/testsuite/tests/safeHaskell/check/pkg01/Makefile
index 1c9d8eb596..ed5185d7e5 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/Makefile
+++ b/testsuite/tests/safeHaskell/check/pkg01/Makefile
@@ -18,7 +18,7 @@ mkPackageDatabase.%:
$(MAKE) -s --no-print-directory cleanPackageDatabase.$*
mkdir pdb.$*
- '$(TEST_HC)' -outputdir pdb.$* -o pdb.$*/setup Setup.hs -v0
+ '$(TEST_HC)' $(TEST_HC_OPTS) -outputdir pdb.$* -o pdb.$*/setup Setup.hs -v0
'$(GHC_PKG)' init pdb.$*/local.db
# We don't make use of -rtsopts in this test, and if it's enabled then
@@ -44,28 +44,28 @@ safePkg01:
$(safePkg01_GHC_PKG) field safePkg01-1.0 trusted
echo
echo 'M_SafePkg'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg2'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg2.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg2.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg3'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg3.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg3.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg4'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg4.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg4.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg5'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg5.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg5.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg6'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg6.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg6.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg7'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg7.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg7.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'M_SafePkg8'
- '$(TEST_HC)' $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg8.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+ '$(TEST_HC)' $(TEST_HC_OPTS) $(SHOW_IFACE) pdb.safePkg01/dist/build/M_SafePkg8.$(HI_SUF) | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
echo
echo 'Testing setting trust'
$(safePkg01_GHC_PKG) trust safePkg01-1.0
diff --git a/testsuite/tests/typecheck/T13168/Makefile b/testsuite/tests/typecheck/T13168/Makefile
index 4dc9d7be28..3cae52a542 100644
--- a/testsuite/tests/typecheck/T13168/Makefile
+++ b/testsuite/tests/typecheck/T13168/Makefile
@@ -8,7 +8,7 @@ CONFIGURE=$(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OP
T13168: 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 package1 && $(CONFIGURE) && $(SETUP) build && $(SETUP) copy && $(SETUP) register
cd package2 && $(CONFIGURE) && $(SETUP) build && $(SETUP) copy && $(SETUP) register
diff --git a/testsuite/tests/typecheck/bug1465/Makefile b/testsuite/tests/typecheck/bug1465/Makefile
index 706b26bbb1..d45fb3c1ee 100644
--- a/testsuite/tests/typecheck/bug1465/Makefile
+++ b/testsuite/tests/typecheck/bug1465/Makefile
@@ -27,7 +27,7 @@ prep:
'$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c -package $(PKG)-2.0 B2.hs
prep.%:
- cd $* && '$(TEST_HC)' -v0 --make -o setup Setup.hs
+ cd $* && '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -o setup Setup.hs
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