diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-06-18 19:45:22 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2016-06-20 16:22:07 +0200 |
| commit | 82f7f1820a175e7e07cbac0ab6d5a9ecddc8acc0 (patch) | |
| tree | 673c36d366a3963bcf3683e6e16439bc3c23ae20 /testsuite/tests/driver/sigof02 | |
| parent | 3b49f8faa1cbd3a04f1d6aa817a315a853e0cd79 (diff) | |
| download | haskell-82f7f1820a175e7e07cbac0ab6d5a9ecddc8acc0.tar.gz | |
Testsuite: delete TEST_HC_OPTS_NO_RECOMP
The previous commits removed `-fforce-recomp` from TEST_HC_OPTS, so
TEST_HC_OPTS_NO_RECOMP = TEST_HC_OPTS.
Diffstat (limited to 'testsuite/tests/driver/sigof02')
| -rw-r--r-- | testsuite/tests/driver/sigof02/Makefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/testsuite/tests/driver/sigof02/Makefile b/testsuite/tests/driver/sigof02/Makefile index 8f153f44ce..5db1628a6a 100644 --- a/testsuite/tests/driver/sigof02/Makefile +++ b/testsuite/tests/driver/sigof02/Makefile @@ -2,11 +2,7 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -# -fforce-recomp makes lots of driver tests trivially pass, so we -# filter it out from $(TEST_HC_OPTS). -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - -S02_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02 -i -itmp_sigof02 +S02_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof02 -i -itmp_sigof02 sigof02: rm -rf tmp_sigof02 mkdir tmp_sigof02 @@ -20,14 +16,14 @@ sigof02: '$(TEST_HC)' $(S02_OPTS) -package containers tmp_sigof02/Main.o -o tmp_sigof02/LazyMain ./tmp_sigof02/LazyMain -S02T_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface -outputdir tmp_sigof02t -i -itmp_sigof02t +S02T_OPTS=$(TEST_HC_OPTS) -fno-code -fwrite-interface -outputdir tmp_sigof02t -i -itmp_sigof02t sigof02t: rm -rf tmp_sigof02t mkdir tmp_sigof02t '$(TEST_HC)' $(S02T_OPTS) -c Map.hsig '$(TEST_HC)' $(S02T_OPTS) -c Main.hs -S02M_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02m +S02M_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof02m sigof02m: rm -rf tmp_sigof02m mkdir tmp_sigof02m @@ -40,9 +36,9 @@ sigof02m: sigof02mt: rm -rf tmp_sigof02mt mkdir tmp_sigof02mt - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02mt --make Main.hs -fno-code -fwrite-interface + '$(TEST_HC)' $(TEST_HC_OPTS) -outputdir tmp_sigof02mt --make Main.hs -fno-code -fwrite-interface -S02D_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02d -i -itmp_sigof02d +S02D_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof02d -i -itmp_sigof02d sigof02d: rm -rf tmp_sigof02d mkdir tmp_sigof02d @@ -53,7 +49,7 @@ sigof02d: '$(TEST_HC)' $(S02D_OPTS) -package containers tmp_sigof02d/Main.o -o tmp_sigof02d/Double ./tmp_sigof02d/Double -S02DT_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02dt -i -itmp_sigof02dt -fno-code -fwrite-interface +S02DT_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof02dt -i -itmp_sigof02dt -fno-code -fwrite-interface sigof02dt: rm -rf tmp_sigof02dt mkdir tmp_sigof02dt @@ -65,11 +61,11 @@ sigof02dm: rm -rf tmp_sigof02dm mkdir tmp_sigof02dm '$(GHC_PKG)' field containers key | sed 's/^.*: *//' > tmp_sigof02dm/containers - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02dm --make Double.hs -sig-of "Map is `cat tmp_sigof02dm/containers`:Data.Map.Lazy, MapAsSet is `cat tmp_sigof02dm/containers`:Data.Map.Lazy" -o tmp_sigof02dm/Double + '$(TEST_HC)' $(TEST_HC_OPTS) -outputdir tmp_sigof02dm --make Double.hs -sig-of "Map is `cat tmp_sigof02dm/containers`:Data.Map.Lazy, MapAsSet is `cat tmp_sigof02dm/containers`:Data.Map.Lazy" -o tmp_sigof02dm/Double ./tmp_sigof02dm/Double sigof02dmt: rm -rf tmp_sigof02dmt mkdir tmp_sigof02dmt # doesn't typecheck due to lack of alias - ! '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof02dmt -fno-code -fwrite-interface --make Double.hs -o tmp_sigof02dmt/Double + ! '$(TEST_HC)' $(TEST_HC_OPTS) -outputdir tmp_sigof02dmt -fno-code -fwrite-interface --make Double.hs -o tmp_sigof02dmt/Double |