diff options
42 files changed, 180 insertions, 313 deletions
diff --git a/testsuite/tests/determinism/determ002/Makefile b/testsuite/tests/determinism/determ002/Makefile index d94a1c22ec..3859f52a39 100644 --- a/testsuite/tests/determinism/determ002/Makefile +++ b/testsuite/tests/determinism/determ002/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ002: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) A.hs $(CP) A.hi A.old.hi $(RM) A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) A.hs diff A.hi A.old.hi diff --git a/testsuite/tests/determinism/determ003/Makefile b/testsuite/tests/determinism/determ003/Makefile index bab18e8de9..faff63e75c 100644 --- a/testsuite/tests/determinism/determ003/Makefile +++ b/testsuite/tests/determinism/determ003/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ003: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=0 -dunique-increment=1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O -dinitial-unique=0 -dunique-increment=1 A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ007/Makefile b/testsuite/tests/determinism/determ007/Makefile index c95e3f0fb9..51fa38df58 100644 --- a/testsuite/tests/determinism/determ007/Makefile +++ b/testsuite/tests/determinism/determ007/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ007: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ008/Makefile b/testsuite/tests/determinism/determ008/Makefile index eec3bccb0d..e05e1b9444 100644 --- a/testsuite/tests/determinism/determ008/Makefile +++ b/testsuite/tests/determinism/determ008/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ008: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ009/Makefile b/testsuite/tests/determinism/determ009/Makefile index caceae48b6..8e1c9081fc 100644 --- a/testsuite/tests/determinism/determ009/Makefile +++ b/testsuite/tests/determinism/determ009/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ009: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ010/Makefile b/testsuite/tests/determinism/determ010/Makefile index 1f126222da..6110db0703 100644 --- a/testsuite/tests/determinism/determ010/Makefile +++ b/testsuite/tests/determinism/determ010/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ010: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ011/Makefile b/testsuite/tests/determinism/determ011/Makefile index f50ed595ab..0575f31eb5 100644 --- a/testsuite/tests/determinism/determ011/Makefile +++ b/testsuite/tests/determinism/determ011/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ011: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ012/Makefile b/testsuite/tests/determinism/determ012/Makefile index 307d9b57fe..95ba197144 100644 --- a/testsuite/tests/determinism/determ012/Makefile +++ b/testsuite/tests/determinism/determ012/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ012: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ013/Makefile b/testsuite/tests/determinism/determ013/Makefile index a28a13fa36..38bf8095da 100644 --- a/testsuite/tests/determinism/determ013/Makefile +++ b/testsuite/tests/determinism/determ013/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ013: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ014/Makefile b/testsuite/tests/determinism/determ014/Makefile index d170232d76..39fc17e114 100644 --- a/testsuite/tests/determinism/determ014/Makefile +++ b/testsuite/tests/determinism/determ014/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ014: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ015/Makefile b/testsuite/tests/determinism/determ015/Makefile index 4ba32f0e02..11d5419292 100644 --- a/testsuite/tests/determinism/determ015/Makefile +++ b/testsuite/tests/determinism/determ015/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ015: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ016/Makefile b/testsuite/tests/determinism/determ016/Makefile index f6d0009fbb..22fc6affcf 100644 --- a/testsuite/tests/determinism/determ016/Makefile +++ b/testsuite/tests/determinism/determ016/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ016: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ017/Makefile b/testsuite/tests/determinism/determ017/Makefile index 6881e4318a..3857085d0a 100644 --- a/testsuite/tests/determinism/determ017/Makefile +++ b/testsuite/tests/determinism/determ017/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ017: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ018/Makefile b/testsuite/tests/determinism/determ018/Makefile index 227c0903fa..d2955d1fe4 100644 --- a/testsuite/tests/determinism/determ018/Makefile +++ b/testsuite/tests/determinism/determ018/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ018: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/determ019/Makefile b/testsuite/tests/determinism/determ019/Makefile index df018e225b..a0d43eef8a 100644 --- a/testsuite/tests/determinism/determ019/Makefile +++ b/testsuite/tests/determinism/determ019/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ019: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.normal.hi $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777215 -dunique-increment=-1 -O A.hs diff A.hi A.normal.hi diff --git a/testsuite/tests/determinism/simplCore/should_compile/Makefile b/testsuite/tests/determinism/simplCore/should_compile/Makefile index 4512271217..998e6eacb2 100644 --- a/testsuite/tests/determinism/simplCore/should_compile/Makefile +++ b/testsuite/tests/determinism/simplCore/should_compile/Makefile @@ -2,12 +2,10 @@ TOP=../../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ006: $(RM) spec-inline-determ.hi spec-inline-determ.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O2 spec-inline-determ.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -O2 spec-inline-determ.hs $(CP) spec-inline-determ.hi spec-inline-determ.old.hi $(RM) spec-inline-determ.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777206 -dunique-increment=-1 -O2 spec-inline-determ.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777206 -dunique-increment=-1 -O2 spec-inline-determ.hs diff spec-inline-determ.hi spec-inline-determ.old.hi diff --git a/testsuite/tests/determinism/typecheck/Makefile b/testsuite/tests/determinism/typecheck/Makefile index ac98ea15ff..d7ee950b01 100644 --- a/testsuite/tests/determinism/typecheck/Makefile +++ b/testsuite/tests/determinism/typecheck/Makefile @@ -2,12 +2,10 @@ TOP=../../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk -TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS)) - determ005: $(RM) A.hi A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=0 -dunique-increment=1 -O A.hs $(CP) A.hi A.old.hi $(RM) A.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777206 -dunique-increment=-1 -O A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -dinitial-unique=16777206 -dunique-increment=-1 -O A.hs diff A.hi A.old.hi diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile index 79615f5160..22c70dd7e3 100644 --- a/testsuite/tests/driver/Makefile +++ b/testsuite/tests/driver/Makefile @@ -14,10 +14,7 @@ include $(TOP)/mk/test.mk OBJSUFFIX = .o -# -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)) -TEST_HC_OPTS_NO_RECOMP_NO_RTSOPTS = $(filter-out -rtsopts,$(TEST_HC_OPTS_NO_RECOMP)) +TEST_HC_OPTS_NO_RTSOPTS = $(filter-out -rtsopts,$(TEST_HC_OPTS)) # ----------------------------------------------------------------------------- # One-shot compilations, non-hierarchical modules @@ -25,7 +22,7 @@ TEST_HC_OPTS_NO_RECOMP_NO_RTSOPTS = $(filter-out -rtsopts,$(TEST_HC_OPTS_NO_RECO test011: $(RM) A011.hi $(RM) A011$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c A011.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -c A011.hs test -f A011.hi test -f A011$(OBJSUFFIX) @@ -33,14 +30,14 @@ test011: test012: $(RM) A012.hi $(RM) A012$(OBJSUFFIX)oo - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c A012.hs -o A012$(OBJSUFFIX)oo + "$(TEST_HC)" $(TEST_HC_OPTS) -c A012.hs -o A012$(OBJSUFFIX)oo test -f A012$(OBJSUFFIX)oo # test -ohi test013: $(RM) A013.xhi $(RM) A013$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c A013.hs -ohi A013.xhi + "$(TEST_HC)" $(TEST_HC_OPTS) -c A013.hs -ohi A013.xhi test -f A013.xhi # test -odir @@ -48,7 +45,7 @@ test014: $(RM) -f A014.hi $(RM) -rf obj014 mkdir obj014 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c A014.hs -odir obj014 + "$(TEST_HC)" $(TEST_HC_OPTS) -c A014.hs -odir obj014 test -f obj014/A014$(OBJSUFFIX) test -f A014.hi @@ -57,20 +54,20 @@ test015: $(RM) -f A015$(OBJSUFFIX) $(RM) -rf hi015 mkdir hi015 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c A015.hs -hidir hi015 + "$(TEST_HC)" $(TEST_HC_OPTS) -c A015.hs -hidir hi015 test -f A015$(OBJSUFFIX) test -f hi015/A015.hi # test stub generation test016: $(RM) F016.hi F016$(OBJSUFFIX) F016_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c F016.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -c F016.hs test -f F016_stub.h # test -stubdir (filename differs from module name) test017: $(RM) F017.hi F017$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c F017.hs -stubdir stub017 + "$(TEST_HC)" $(TEST_HC_OPTS) -c F017.hs -stubdir stub017 test -f stub017/TestStub017_stub.h # test -odir with stubs (filename differs from module name) @@ -78,18 +75,18 @@ test018: $(RM) -f F018.hi F018$(OBJSUFFIX) F018_stub.h $(RM) -rf obj018 mkdir obj018 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c F018.hs -odir obj018 + "$(TEST_HC)" $(TEST_HC_OPTS) -c F018.hs -odir obj018 # test for bug #3093 test018a: $(RM) -f F018a.hi F018a_stub.h *.obj.018 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c F018a.hs -osuf obj.018 + "$(TEST_HC)" $(TEST_HC_OPTS) -c F018a.hs -osuf obj.018 test -f F018a.obj.018 # test -outputdir test019: $(RM) -rf out019 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c F019.hs -outputdir out019 + "$(TEST_HC)" $(TEST_HC_OPTS) -c F019.hs -outputdir out019 test -f out019/TestStub019.hi test -f out019/TestStub019_stub.h @@ -99,7 +96,7 @@ test019: test021: $(RM) B021/C.hi $(RM) B021/C$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B021/C.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -c B021/C.hs test -f B021/C.hi test -f B021/C$(OBJSUFFIX) @@ -107,14 +104,14 @@ test021: test022: $(RM) B022/C.hi $(RM) B022/C$(OBJSUFFIX)oo - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B022/C.hs -o B022/C$(OBJSUFFIX)oo + "$(TEST_HC)" $(TEST_HC_OPTS) -c B022/C.hs -o B022/C$(OBJSUFFIX)oo test -f B022/C$(OBJSUFFIX)oo # test -ohi test023: $(RM) B023/C.xhi $(RM) B023/C$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B023/C.hs -ohi B023/C.xhi + "$(TEST_HC)" $(TEST_HC_OPTS) -c B023/C.hs -ohi B023/C.xhi test -f B023/C.xhi # test -odir @@ -122,7 +119,7 @@ test024: $(RM) -f B024/C.hi $(RM) -rf obj024 mkdir obj024 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B024/C.hs -odir obj024 + "$(TEST_HC)" $(TEST_HC_OPTS) -c B024/C.hs -odir obj024 test -f obj024/B024/C$(OBJSUFFIX) # test -odir with non-Haskell compilation @@ -132,7 +129,7 @@ test024a: mkdir B024a mkdir obj024a echo >B024a/stub.c - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B024a/stub.c -odir obj024a + "$(TEST_HC)" $(TEST_HC_OPTS) -c B024a/stub.c -odir obj024a test -f obj024a/B024a/stub$(OBJSUFFIX) # test -hidir @@ -140,14 +137,14 @@ test025: $(RM) -rf hi025 mkdir hi025 $(RM) B025/C$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B025/C.hs -hidir hi025 + "$(TEST_HC)" $(TEST_HC_OPTS) -c B025/C.hs -hidir hi025 test -f hi025/B025/C.hi # This is a hierarchical module that lives in a subdirectory. test026: $(RM) d026/P/Q.hi $(RM) d026/P/Q$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c d026/P/Q.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -c d026/P/Q.hs test -f d026/P/Q.hi test -f d026/P/Q$(OBJSUFFIX) @@ -155,7 +152,7 @@ test026: # -fvia-C, because we want to check that the .hc file can #include the stub.h test027: $(RM) B027/F.hi B027/F$(OBJSUFFIX) B027/F_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B027/F.hs -fno-warn-deprecated-flags -fvia-C + "$(TEST_HC)" $(TEST_HC_OPTS) -c B027/F.hs -fno-warn-deprecated-flags -fvia-C test -f B027/F_stub.h # test -stubdir @@ -163,7 +160,7 @@ test027: test028: $(RM) B028/F.hi B028/F$(OBJSUFFIX) $(RM) stub028/B028/F_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c B028/F.hs -stubdir stub028 -fno-warn-deprecated-flags -fvia-C + "$(TEST_HC)" $(TEST_HC_OPTS) -c B028/F.hs -stubdir stub028 -fno-warn-deprecated-flags -fvia-C test -f stub028/B028/F_stub.h # ----------------------------------------------------------------------------- @@ -172,7 +169,7 @@ test028: test031: $(RM) A031.hi $(RM) A031$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make A031.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A031.hs test -f A031.hi test -f A031$(OBJSUFFIX) @@ -181,7 +178,7 @@ test032: $(RM) A032.hi $(RM) -rf obj032 mkdir obj032 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make A032.hs -odir obj032 + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A032.hs -odir obj032 test -f obj032/A032$(OBJSUFFIX) # test -hidir @@ -189,19 +186,19 @@ test033: $(RM) -rf hi033 $(RM) A033$(OBJSUFFIX) mkdir hi033 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make A033.hs -hidir hi033 + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A033.hs -hidir hi033 test -f hi033/A033.hi # test stub generation test034: $(RM) F034.hi F034$(OBJSUFFIX) F034_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make F034.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make F034.hs test -f F034_stub.h # test -stubdir (filename differs from module name) test035: $(RM) F035.hi F$(OBJSUFFIX) stub035/Stubs_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make F035.hs -stubdir stub035 + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make F035.hs -stubdir stub035 test -f stub035/TestStub035_stub.h # ----------------------------------------------------------------------------- @@ -210,7 +207,7 @@ test035: test041: $(RM) B041/C.hi $(RM) B041/C$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make B041/C.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B041/C.hs test -f B041/C.hi test -f B041/C$(OBJSUFFIX) @@ -219,7 +216,7 @@ test042: $(RM) -rf obj042 mkdir obj042 $(RM) B042/C.hi - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make B042/C.hs -odir obj042 + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B042/C.hs -odir obj042 test -f obj042/B042/C$(OBJSUFFIX) # test -odir with stubs @@ -227,7 +224,7 @@ test042stub: $(RM) -rf obj042stub mkdir obj042stub $(RM) B042stub/C.hi - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make B042stub/C.hs -odir obj042stub + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B042stub/C.hs -odir obj042stub test -f obj042stub/B042stub/C$(OBJSUFFIX) # test -hidir @@ -235,20 +232,20 @@ test043: $(RM) -f B043/C$(OBJSUFFIX) $(RM) -rf hi043 mkdir hi043 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make B043/C.hs -hidir hi043 + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B043/C.hs -hidir hi043 test -f hi043/B043/C.hi # test stub generation test044: $(RM) B044/F.hi B044/F$(OBJSUFFIX) B044/F_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make B044/F.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B044/F.hs test -f B044/F_stub.h # test -stubdir test045: $(RM) B045/F.hi B045/F$(OBJSUFFIX) $(RM) stub045/B045/F_stub.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make B045/F.hs -stubdir stub045 + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B045/F.hs -stubdir stub045 test -f stub045/B045/F_stub.h # ----------------------------------------------------------------------------- @@ -259,7 +256,7 @@ test051: $(RM) d051_2/R/S$(OBJSUFFIX) $(RM) d051_1/P/Q.hi $(RM) d051_1/P/Q$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -id051_1 -id051_2 R.S + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id051_1 -id051_2 R.S test -f d051_2/R/S.hi test -f d051_2/R/S$(OBJSUFFIX) test -f d051_1/P/Q.hi @@ -271,7 +268,7 @@ test052: $(RM) d052_1/P/Q.hi $(RM) -rf obj052 mkdir obj052 - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -id052_1 -id052_2 -odir obj052 R.S + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id052_1 -id052_2 -odir obj052 R.S test -f d052_2/R/S.hi test -f obj052/R/S$(OBJSUFFIX) test -f d052_1/P/Q.hi @@ -283,7 +280,7 @@ test053: $(RM) d053_2/R/S$(OBJSUFFIX) $(RM) hi053/P/Q.hi $(RM) d053_1/P/Q$(OBJSUFFIX) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -id053_1 -id053_2 -hidir hi053 R.S + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id053_1 -id053_2 -hidir hi053 R.S test -f hi053/R/S.hi test -f d053_2/R/S$(OBJSUFFIX) test -f hi053/P/Q.hi @@ -295,44 +292,44 @@ test053: # Test that -keep-s-files works with --make and -fvia-C test061a: $(RM) A061a.hi A061a$(OBJSUFFIX) A061a.s - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -keep-s-files -fno-warn-deprecated-flags -fvia-C A061a.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -keep-s-files -fno-warn-deprecated-flags -fvia-C A061a.hs test -f A061a.s # Test that -keep-s-files works without --make test061b: $(RM) A061b.hi A061b$(OBJSUFFIX) A061b.s - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c -keep-s-files -fno-warn-deprecated-flags -fvia-C A061b.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -c -keep-s-files -fno-warn-deprecated-flags -fvia-C A061b.hs test -f A061b.s # Test that -main-is works with --make test062a: $(RM) Hello062a.hs Hello062a.hi Hello062a$(OBJSUFFIX) Hello062a.hc hello062a echo "module Hello062a where { hello062a = putStrLn \"ok\" }" >Hello062a.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is Hello062a.hello062a Hello062a -o hello062a + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is Hello062a.hello062a Hello062a -o hello062a ./hello062a test062b: $(RM) Hello062b.hs Hello062b.hi Hello062b$(OBJSUFFIX) Hello062b.hc hello062b echo "module Hello062b where { main = putStrLn \"ok\" }" >Hello062b.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is Hello062b Hello062b -o hello062b + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is Hello062b Hello062b -o hello062b ./hello062b test062c: $(RM) Hello062c.hs Hello062c.hi Hello062c$(OBJSUFFIX) Hello062c.hc hello062c echo "module Main (hello062c) where { hello062c = putStrLn \"ok\" }" >Hello062c.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is hello062c Hello062c.hs -o hello062c + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is hello062c Hello062c.hs -o hello062c ./hello062c test062d: $(RM) -rf B062d $(RM) hello062d mkdir B062d echo "module B062d.Hello062d (hello062d) where { hello062d = putStrLn \"ok\" }" >B062d/Hello062d.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is B062d.Hello062d.hello062d B062d/Hello062d.hs -o hello062d + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is B062d.Hello062d.hello062d B062d/Hello062d.hs -o hello062d ./hello062d test062e: $(RM) -rf B062e $(RM) Hello062e.hc hello062e mkdir B062e echo "module B062e.Hello062e (main) where { main = putStrLn \"ok\" }" >B062e/Hello062e.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -main-is B062e.Hello062e B062e/Hello062e.hs -o hello062e + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is B062e.Hello062e B062e/Hello062e.hs -o hello062e ./hello062e # Test that -i deletes the list of search paths. @@ -340,42 +337,42 @@ test062e: # compare the output, because make might give us a different exit code. test063: $(RM) A063.hi A063$(OBJSUFFIX) A063.hc D063.hi D063$(OBJSUFFIX) D063.hc - -"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make -i -v0 D063.hs + -"$(TEST_HC)" $(TEST_HC_OPTS) --make -i -v0 D063.hs # Test -E test064: $(RM) A064.hi A064.hspp - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -E A064.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -E A064.hs test -f A064.hspp # Test -E/-cpp test065: $(RM) A065.hi A065.hspp - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -E -cpp A065.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -E -cpp A065.hs test -f A065.hspp # Test -E/-o test066: $(RM) A066.hi A066.tmp - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -E A066.hs -o A066.tmp + "$(TEST_HC)" $(TEST_HC_OPTS) -E A066.hs -o A066.tmp test -f A066.tmp # Test -E/-cpp/-o test067: $(RM) A067.hi A067.tmp - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -cpp -E A067.hs -o A067.tmp + "$(TEST_HC)" $(TEST_HC_OPTS) -cpp -E A067.hs -o A067.tmp test -f A067.tmp # Test -S test070: $(RM) A070.hi A070.s - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -S A070.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -S A070.hs test -f A070.s # Test -S/-o test071: $(RM) A071.hi A071.tmp - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -S A071.hs -o A071.tmp + "$(TEST_HC)" $(TEST_HC_OPTS) -S A071.hs -o A071.tmp test -f A071.tmp @@ -384,7 +381,7 @@ test071: define test081 $(RM) $(1).hs $(1).hi $(1)$(OBJSUFFIX) $(1).hc $(1)$(exeext) echo "module Main where { main = putStrLn \"ok\" }" >$(1).hs -"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make -v0 $(1).hs +"$(TEST_HC)" $(TEST_HC_OPTS) --make -v0 $(1).hs test -f $(1)$(exeext) endef @@ -400,7 +397,7 @@ test081b: test100: $(RM) overlap/List.hi overlap/List.o $(RM) overlap/Overlap.hi overlap/Overlap.o - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -ioverlap Overlap + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -ioverlap Overlap # ----------------------------------------------------------------------------- # dependency-generation tests @@ -411,17 +408,17 @@ DEPFILE200 = depend200 # modify an existing dependency file. test200: $(RM) $(DEPFILE200) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -M -dep-suffix "" -dep-makefile $(DEPFILE200) D200 + "$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-suffix "" -dep-makefile $(DEPFILE200) D200 test -f $(DEPFILE200) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -M -dep-suffix "" -dep-makefile $(DEPFILE200) D200 B200.C A200 + "$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-suffix "" -dep-makefile $(DEPFILE200) D200 B200.C A200 test -f $(DEPFILE200) - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -M -dep-suffix "" -dep-makefile $(DEPFILE200) D200.hs B200/C.hs A200.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-suffix "" -dep-makefile $(DEPFILE200) D200.hs B200/C.hs A200.hs test -f $(DEPFILE200) # ----------------------------------------------------------------------------- T2566:: - if "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c foo2566.bar; then false else true; fi + if "$(TEST_HC)" $(TEST_HC_OPTS) -c foo2566.bar; then false else true; fi .PHONY: mode001 # We use @@ -450,34 +447,34 @@ mode001: # Test for building DLLs with ghc -shared, see #2745 shared001: $(RM) Shared001.hi Shared001.o HSdll.dll.a HSdll.dll Shared001_stub.* - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP_NO_RTSOPTS) -v0 -shared Shared001.hs + "$(TEST_HC)" $(TEST_HC_OPTS_NO_RTSOPTS) -v0 -shared Shared001.hs static001: $(RM) Static001.hi Static001.o liba.a Static001_stub.* - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP_NO_RTSOPTS) -v0 -staticlib Static001.hs + "$(TEST_HC)" $(TEST_HC_OPTS_NO_RTSOPTS) -v0 -staticlib Static001.hs # ----------------------------------------------------------------------------- T3674: $(RM) T3674*.o T3674*.hi T3674_pre - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make T3674_pre.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make T3674.hs + "$(TEST_HC)" $(TEST_HC_OPTS) --make T3674_pre.hs + "$(TEST_HC)" $(TEST_HC_OPTS) --make T3674.hs .PHONY: rtsopts001 rtsopts001: $(RM) rtsOpts$(exeext) rtsOpts.hi rtsOpts.o - "$(TEST_HC)" $(filter-out -rtsopts,$(TEST_HC_OPTS_NO_RECOMP)) -v0 --make rtsOpts -rtsopts + "$(TEST_HC)" $(filter-out -rtsopts,$(TEST_HC_OPTS)) -v0 --make rtsOpts -rtsopts echo "Normal" -./rtsOpts +RTS -C0 2>&1 $(RM) rtsOpts$(exeext) rtsOpts.hi rtsOpts.o - "$(TEST_HC)" $(filter-out -rtsopts,$(TEST_HC_OPTS_NO_RECOMP)) -v0 --make rtsOpts + "$(TEST_HC)" $(filter-out -rtsopts,$(TEST_HC_OPTS)) -v0 --make rtsOpts echo "No RTS opts" -./rtsOpts +RTS -C0 2>&1 .PHONY: rtsopts002 rtsopts002: $(RM) rtsopts002$(exeext) rtsopts002.hi rtsopts002.o - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make rtsopts002 -rtsopts=some + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsopts002 -rtsopts=some ./rtsopts002 ./rtsopts002 +RTS --info >/dev/null if ./rtsopts002 +RTS -C0; then exit 1; else exit 0; fi @@ -488,25 +485,25 @@ rtsopts002: .PHONY: withRtsOpts withRtsOpts: $(RM) withRtsOpts$(exeext) withRtsOpts.hi withRtsOpts.o withRtsOpts.out - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make withRtsOpts -with-rtsopts=--info + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make withRtsOpts -with-rtsopts=--info ./withRtsOpts | head -1 # Also test for non-safe RTS opts, these should be allowed too, # since the author has explicitly requested them. (#5114) $(RM) withRtsOpts$(exeext) withRtsOpts.hi withRtsOpts.o withRtsOpts.out - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -v0 --make withRtsOpts -with-rtsopts=-twithRtsOpts.out + "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make withRtsOpts -with-rtsopts=-twithRtsOpts.out ./withRtsOpts | head -1 test -f withRtsOpts.out .PHONY: T3364 T3364: - -"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -H + -"$(TEST_HC)" $(TEST_HC_OPTS) -H .PHONY: T706 T706: cp T706a.hs T706.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) $(ghciWayFlags) -c T706.hs + "$(TEST_HC)" $(TEST_HC_OPTS) $(ghciWayFlags) -c T706.hs cp T706b.hs T706.hs - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) $(ghciWayFlags) -c T706.hs + "$(TEST_HC)" $(TEST_HC_OPTS) $(ghciWayFlags) -c T706.hs echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) T706 .PHONY: T5584 @@ -519,28 +516,28 @@ T5584: T5198: $(RM) -rf T5198dump [ ! -d T5198dump ] - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c T5198.hs -dumpdir T5198dump -ddump-to-file -ddump-simpl + "$(TEST_HC)" $(TEST_HC_OPTS) -c T5198.hs -dumpdir T5198dump -ddump-to-file -ddump-simpl [ -f T5198dump/T5198.dump-simpl ] .PHONY: T7060a T7060a: $(RM) -rf T7060dump [ ! -d T7060dump ] - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -O -c T7060.hs -dumpdir T7060dump -ddump-to-file -ddump-rules + "$(TEST_HC)" $(TEST_HC_OPTS) -O -c T7060.hs -dumpdir T7060dump -ddump-to-file -ddump-rules [ -f T7060dump/T7060.dump-rules ] .PHONY: T7060b T7060b: $(RM) -rf T7060dump [ ! -d T7060dump ] - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -O -c T7060.hs -dumpdir T7060dump -ddump-to-file -ddump-rule-firings + "$(TEST_HC)" $(TEST_HC_OPTS) -O -c T7060.hs -dumpdir T7060dump -ddump-to-file -ddump-rule-firings [ -f T7060dump/T7060.dump-rule-firings ] .PHONY: T7060c T7060c: $(RM) -rf T7060dump [ ! -d T7060dump ] - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -O -c T7060.hs -dumpdir T7060dump -ddump-to-file -ddump-rule-rewrites + "$(TEST_HC)" $(TEST_HC_OPTS) -O -c T7060.hs -dumpdir T7060dump -ddump-to-file -ddump-rule-rewrites [ -f T7060dump/T7060.dump-rule-rewrites ] .PHONY: T7060 @@ -548,11 +545,11 @@ T7060: T7060a T7060b T7060c .PHONY: T7130 T7130: - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -fflul-laziness + "$(TEST_HC)" $(TEST_HC_OPTS) -fflul-laziness .PHONY: T7563 T7563: - -"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -C T7563.hs + -"$(TEST_HC)" $(TEST_HC_OPTS) -C T7563.hs # Below we set LC_ALL=C to request standard ASCII output in the resulting error # messages. Unfortunately, Mac OS X and Windows still use a Unicode encoding @@ -560,15 +557,15 @@ T7563: .PHONY: T6037 T6037: - -LC_ALL=C "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c T6037.hs + -LC_ALL=C "$(TEST_HC)" $(TEST_HC_OPTS) -c T6037.hs .PHONY: T2507 T2507: - -LC_ALL=C "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c T2507.hs + -LC_ALL=C "$(TEST_HC)" $(TEST_HC_OPTS) -c T2507.hs .PHONY: T8959a T8959a: - -LC_ALL=C "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c T8959a.hs -XUnicodeSyntax + -LC_ALL=C "$(TEST_HC)" $(TEST_HC_OPTS) -c T8959a.hs -XUnicodeSyntax .PHONY: T703 T703: @@ -627,8 +624,8 @@ T12135: $(RM) -rf T12135.o T12135.hi T12135 T12135a T12135b mkdir T12135a T12135b cp T12135a.h T12135a/T12135.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -IT12135b -IT12135a --make T12135.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -IT12135b -IT12135a --make T12135.hs ./T12135 cp T12135b.h T12135b/T12135.h - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -IT12135b -IT12135a --make T12135.hs + "$(TEST_HC)" $(TEST_HC_OPTS) -IT12135b -IT12135a --make T12135.hs ./T12135 diff --git a/testsuite/tests/driver/T1372/Makefile b/testsuite/tests/driver/T1372/Makefile index 22260cf6e3..31e1c15b81 100644 --- a/testsuite/tests/driver/T1372/Makefile +++ b/testsuite/tests/driver/T1372/Makefile @@ -2,10 +2,6 @@ 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)) - LOCAL_PKGCONF=local.package.conf clean: @@ -34,7 +30,7 @@ prep: cd p1 && ./setup build -v0 prep.%: - cd $* && "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -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-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF) cd $* && ./setup build -v0 cd $* && ./setup register -v0 --inplace diff --git a/testsuite/tests/driver/T1959/Makefile b/testsuite/tests/driver/T1959/Makefile index 73b321f2a9..05e098a599 100644 --- a/testsuite/tests/driver/T1959/Makefile +++ b/testsuite/tests/driver/T1959/Makefile @@ -2,18 +2,14 @@ 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)) - # Test recompilation bug #1959, which failed in 6.8.1 (and earlier) compile :: - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c -O E.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c -O D.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c -O -funfolding-use-threshold=0 C.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c -O B.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) E.o D.o C.o B.o -o prog + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O E.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O D.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O -funfolding-use-threshold=0 C.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -c -O B.hs + '$(TEST_HC)' $(TEST_HC_OPTS) E.o D.o C.o B.o -o prog clean :: rm -f *.o *.hi E.hs diff --git a/testsuite/tests/driver/T437/Makefile b/testsuite/tests/driver/T437/Makefile index 8c18b1c3c3..3ba9faef66 100644 --- a/testsuite/tests/driver/T437/Makefile +++ b/testsuite/tests/driver/T437/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -16,12 +12,12 @@ clean: # bug #437 T437: clean - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test.main Test.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test2.main Test2.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -main-is Test.main Test.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -main-is Test2.main Test2.hs ./Test ./Test2 sleep 1 # Test that changing the main function name forces recomp of Test2 - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -main-is Test2.doit Test2.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -main-is Test2.doit Test2.hs ./Test2 diff --git a/testsuite/tests/driver/T5147/Makefile b/testsuite/tests/driver/T5147/Makefile index d0769b8f5e..e298ad7209 100644 --- a/testsuite/tests/driver/T5147/Makefile +++ b/testsuite/tests/driver/T5147/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -17,9 +13,9 @@ clean: T5147: clean cp B1.hs B.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -v0 A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 A.hs sleep 1 cp B2.hs B.hs - if '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -v0 A.hs; then exit 1; else exit 0; fi + if '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 A.hs; then exit 1; else exit 0; fi # Reverse the sense of the error; we *expect* # the compilation to fail, and then we want to succeed diff --git a/testsuite/tests/driver/recomp001/Makefile b/testsuite/tests/driver/recomp001/Makefile index dc7d492cb1..de4f9814c6 100644 --- a/testsuite/tests/driver/recomp001/Makefile +++ b/testsuite/tests/driver/recomp001/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -17,6 +13,6 @@ clean: recomp001: clean cp B1.hs B.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -v0 C.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 C.hs cp B2.hs B.hs - -'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -v0 C.hs + -'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 C.hs diff --git a/testsuite/tests/driver/recomp002/Makefile b/testsuite/tests/driver/recomp002/Makefile index f2cd3d55dc..0dd8f47ca4 100644 --- a/testsuite/tests/driver/recomp002/Makefile +++ b/testsuite/tests/driver/recomp002/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -15,6 +11,6 @@ clean: # Only the first invocation should print any "Compiling" messages recomp002: clean - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make Q.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make Q.hs echo Middle >&2 - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make Q.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make Q.hs diff --git a/testsuite/tests/driver/recomp003/Makefile b/testsuite/tests/driver/recomp003/Makefile index 85c45adc7b..7f6bfc2e48 100644 --- a/testsuite/tests/driver/recomp003/Makefile +++ b/testsuite/tests/driver/recomp003/Makefile @@ -2,10 +2,6 @@ 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)) - OBJSUFFIX = .o # Test that adding a new module that shadows a package module causes @@ -14,9 +10,9 @@ recomp003: $(RM) A.hi A$(OBJSUFFIX) out $(RM) -rf Data mkdir Data - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -c A.hs echo "module Data.Char where" > Data/Char.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c Data/Char.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -c Data/Char.hs # Should now recompile A.hs, because Char is now a home module: - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c A.hs 2>err + '$(TEST_HC)' $(TEST_HC_OPTS) -c A.hs 2>err @if grep NOT err; then false; fi diff --git a/testsuite/tests/driver/recomp004/Makefile b/testsuite/tests/driver/recomp004/Makefile index dca4eb5ecf..4ad51d8f60 100644 --- a/testsuite/tests/driver/recomp004/Makefile +++ b/testsuite/tests/driver/recomp004/Makefile @@ -2,10 +2,6 @@ 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)) - EXECUTABLE = MainX$(exeext) CLEAN_FILES = c.c c.o MainX.o MainX.hi $(EXECUTABLE) @@ -17,13 +13,13 @@ recomp004: $(RM) $(CLEAN_FILES) $(CP) c1.c c.c $(CP) Main.hs MainX.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -c c.c -o c.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make MainX.hs c.o -o $(EXECUTABLE) + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c c.c -o c.o + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make MainX.hs c.o -o $(EXECUTABLE) ./$(EXECUTABLE) $(CP) c2.c c.c - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -c c.c -o c.o + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c c.c -o c.o # Hack to make sure c.o is really newer touch -t 01010000 MainX.hs MainX.hi MainX.o c.c $(EXECUTABLE) - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make MainX.hs c.o -o $(EXECUTABLE) + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make MainX.hs c.o -o $(EXECUTABLE) ./$(EXECUTABLE) diff --git a/testsuite/tests/driver/recomp005/Makefile b/testsuite/tests/driver/recomp005/Makefile index 5b7b256c6a..e1bda204b7 100644 --- a/testsuite/tests/driver/recomp005/Makefile +++ b/testsuite/tests/driver/recomp005/Makefile @@ -2,10 +2,6 @@ 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)) - clean: rm -f *.o* rm -f *.hi* @@ -13,8 +9,8 @@ clean: recomp005: clean cp C1.hs C.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make E.hs -O + '$(TEST_HC)' $(TEST_HC_OPTS) --make E.hs -O sleep 1 cp C2.hs C.hs # Should recompile E, because C is now an orphan - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make E.hs -O + '$(TEST_HC)' $(TEST_HC_OPTS) --make E.hs -O diff --git a/testsuite/tests/driver/recomp006/Makefile b/testsuite/tests/driver/recomp006/Makefile index 839dbf0008..a0f55d636d 100644 --- a/testsuite/tests/driver/recomp006/Makefile +++ b/testsuite/tests/driver/recomp006/Makefile @@ -2,10 +2,6 @@ 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)) - OBJSUFFIX = .o # Test that changing the fixity of a type synonym operator forces recompilation @@ -13,8 +9,8 @@ OBJSUFFIX = .o recomp006: $(RM) A.hi A$(OBJSUFFIX) cp B1.hs B.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make A.hs 1>out 2>err + '$(TEST_HC)' $(TEST_HC_OPTS) --make A.hs 1>out 2>err sleep 1 cp B2.hs B.hs # This should fail - if '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make A.hs; then false; fi + if '$(TEST_HC)' $(TEST_HC_OPTS) --make A.hs; then false; fi diff --git a/testsuite/tests/driver/recomp008/Makefile b/testsuite/tests/driver/recomp008/Makefile index f1ade78434..8488a008b7 100644 --- a/testsuite/tests/driver/recomp008/Makefile +++ b/testsuite/tests/driver/recomp008/Makefile @@ -2,21 +2,17 @@ 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)) - Main.o : B.hi B.o : A.hi %.o : %.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -c $< -o $@ + '$(TEST_HC)' $(TEST_HC_OPTS) -O -c $< -o $@ # magic .hi rule: see rules/hi-rule.mk in the GHC source tree %.hi : %.o ; prog : A.o B.o Main.o - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -o prog A.o B.o Main.o + '$(TEST_HC)' $(TEST_HC_OPTS) -o prog A.o B.o Main.o clean : $(RM) *.hi *.o prog diff --git a/testsuite/tests/driver/recomp009/Makefile b/testsuite/tests/driver/recomp009/Makefile index 674c541a5a..dea8ddd179 100644 --- a/testsuite/tests/driver/recomp009/Makefile +++ b/testsuite/tests/driver/recomp009/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -18,9 +14,9 @@ clean: recomp009: clean cp Sub1.hs Sub.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) $(ghcThWayFlags) -v0 --make Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 --make Main.hs ./Main sleep 1 cp Sub2.hs Sub.hs - -'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) $(ghcThWayFlags) -v0 --make Main.hs + -'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 --make Main.hs ./Main diff --git a/testsuite/tests/driver/recomp010/Makefile b/testsuite/tests/driver/recomp010/Makefile index 8e8be2650a..a1b2cab2c6 100644 --- a/testsuite/tests/driver/recomp010/Makefile +++ b/testsuite/tests/driver/recomp010/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -17,10 +13,10 @@ clean: recomp010: clean cp X1.hs X.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -O Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -O Main.hs ./Main sleep 1 cp X2.hs X.hs rm X.o - -'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 --make -O Main.hs + -'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -O Main.hs ./Main diff --git a/testsuite/tests/driver/recomp011/Makefile b/testsuite/tests/driver/recomp011/Makefile index 71eb55e755..29197df07b 100644 --- a/testsuite/tests/driver/recomp011/Makefile +++ b/testsuite/tests/driver/recomp011/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -16,17 +12,17 @@ clean: recomp011: clean echo "main = putStrLn x" >A.hsinc echo "x = show 42" >B.hsinc - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -O Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ./Main sleep 1 echo "x = show 43" >B.hsinc - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -O Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ./Main sleep 1 echo "main = putStrLn (x ++ x)" >A.hsinc - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -O Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs sleep 1 ./Main - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -O Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs # don't change anything; check that no compilation happened ./Main diff --git a/testsuite/tests/driver/recomp012/Makefile b/testsuite/tests/driver/recomp012/Makefile index 180f08ddd8..83a745f641 100644 --- a/testsuite/tests/driver/recomp012/Makefile +++ b/testsuite/tests/driver/recomp012/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -19,12 +15,12 @@ recomp012: clean echo 'module MyBool where data MyBool = MyFalse | MyTrue deriving Show' >MyBool.hs echo 'module Foo where import MyBool; foo = MyFalse' > Foo.hs echo 'import Foo; main = print foo' > Main.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -c -O2 MyBool.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -c -O2 Foo.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -O2 Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c -O2 MyBool.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c -O2 Foo.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O2 Main.hs ./Main sleep 1 echo 'module Foo where import MyBool; foo = MyTrue' > Foo.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -c -O2 Foo.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -v0 -O2 Main.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c -O2 Foo.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O2 Main.hs ./Main diff --git a/testsuite/tests/driver/recomp013/Makefile b/testsuite/tests/driver/recomp013/Makefile index fe14fc431b..7cb79460f1 100644 --- a/testsuite/tests/driver/recomp013/Makefile +++ b/testsuite/tests/driver/recomp013/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -18,8 +14,8 @@ recomp013: clean echo 'module B (module A) where import A hiding (a1)' > B.hs echo 'module C where import B; a2 = 142' > C.hs echo 'first run' - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make C.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make C.hs sleep 1 echo 'module B (module A) where import A hiding (a1, a2)' > B.hs echo 'second run' - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make C.hs + '$(TEST_HC)' $(TEST_HC_OPTS) --make C.hs diff --git a/testsuite/tests/driver/recomp015/Makefile b/testsuite/tests/driver/recomp015/Makefile index 9f7ebc0b7f..a8fbcd38c6 100644 --- a/testsuite/tests/driver/recomp015/Makefile +++ b/testsuite/tests/driver/recomp015/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -28,12 +24,12 @@ recomp015: clean # This test checks that GHC can read these fields correctly and avoids # recompilation (just like recomp011 which does the same thing for a smaller # number of sections) - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) Generate.hs + '$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs ./Generate > ManySections.s echo 'main = putStrLn "Running main..."' > Main.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c ManySections.s - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -O Main.hs ManySections.o + '$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s + '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o ./Main sleep 1 - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) --make -O Main.hs ManySections.o + '$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o ./Main diff --git a/testsuite/tests/driver/retc001/Makefile b/testsuite/tests/driver/retc001/Makefile index a3cf6ebf3d..fd5d2def70 100644 --- a/testsuite/tests/driver/retc001/Makefile +++ b/testsuite/tests/driver/retc001/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -16,9 +12,9 @@ clean: retc001: clean cp B1.hs B.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface --make C.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface --make C.hs echo 'Middle' - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface --make C.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface --make C.hs echo 'End' cp B2.hs B.hs - -'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface --make C.hs + -'$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface --make C.hs diff --git a/testsuite/tests/driver/retc002/Makefile b/testsuite/tests/driver/retc002/Makefile index 528df4b471..cd55ae3534 100644 --- a/testsuite/tests/driver/retc002/Makefile +++ b/testsuite/tests/driver/retc002/Makefile @@ -2,10 +2,6 @@ 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)) - # Recompilation tests clean: @@ -15,6 +11,6 @@ clean: # Only the first invocation should print any "Compiling" messages retc002: clean - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fwrite-interface -fno-code --make Q.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fwrite-interface -fno-code --make Q.hs echo Middle >&2 - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fwrite-interface -fno-code --make Q.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fwrite-interface -fno-code --make Q.hs diff --git a/testsuite/tests/driver/retc003/Makefile b/testsuite/tests/driver/retc003/Makefile index c58d0c580c..be1bd33630 100644 --- a/testsuite/tests/driver/retc003/Makefile +++ b/testsuite/tests/driver/retc003/Makefile @@ -2,10 +2,6 @@ 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)) - OBJSUFFIX = .o # Test that adding a new module that shadows a package module causes @@ -14,11 +10,11 @@ retc003: $(RM) A.hi A$(OBJSUFFIX) out $(RM) -rf Data mkdir Data - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface -c A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface -c A.hs echo 'Middle' - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface -c A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface -c A.hs echo 'End' echo "module Data.Char where" > Data/Char.hs - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface -c Data/Char.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface -c Data/Char.hs # Should now recompile A.hs, because Char is now a home module: - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -fno-code -fwrite-interface -c A.hs + '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fwrite-interface -c A.hs diff --git a/testsuite/tests/driver/sigof01/Makefile b/testsuite/tests/driver/sigof01/Makefile index 84dfc33a9f..aadff83b99 100644 --- a/testsuite/tests/driver/sigof01/Makefile +++ b/testsuite/tests/driver/sigof01/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)) - -S01_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof01 -i -itmp_sigof01 +S01_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof01 -i -itmp_sigof01 sigof01: rm -rf tmp_sigof01 mkdir tmp_sigof01 @@ -19,5 +15,5 @@ sigof01: sigof01m: rm -rf tmp_sigof01m mkdir tmp_sigof01m - '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof01m --make Main.hs -sig-of "B is main:A" -o tmp_sigof01m/Main + '$(TEST_HC)' $(TEST_HC_OPTS) -outputdir tmp_sigof01m --make Main.hs -sig-of "B is main:A" -o tmp_sigof01m/Main tmp_sigof01m/Main 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 diff --git a/testsuite/tests/driver/sigof03/Makefile b/testsuite/tests/driver/sigof03/Makefile index 03a0b9b2da..338d8d4fe2 100644 --- a/testsuite/tests/driver/sigof03/Makefile +++ b/testsuite/tests/driver/sigof03/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)) - -S03_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof03 -i -itmp_sigof03 +S03_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof03 -i -itmp_sigof03 sigof03: rm -rf tmp_sigof03 mkdir tmp_sigof03 @@ -17,7 +13,7 @@ sigof03: '$(TEST_HC)' $(S03_OPTS) tmp_sigof03/A.o tmp_sigof03/Main.o -o tmp_sigof03/Main ./tmp_sigof03/Main -S03M_OPTS=$(TEST_HC_OPTS_NO_RECOMP) -outputdir tmp_sigof03m +S03M_OPTS=$(TEST_HC_OPTS) -outputdir tmp_sigof03m sigof03m: rm -rf tmp_sigof03m mkdir tmp_sigof03m diff --git a/testsuite/tests/driver/sigof04/Makefile b/testsuite/tests/driver/sigof04/Makefile index f013b0c202..0c1e754394 100644 --- a/testsuite/tests/driver/sigof04/Makefile +++ b/testsuite/tests/driver/sigof04/Makefile @@ -2,13 +2,9 @@ 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)) - clean: rm -rf containers sigof04: '$(GHC_PKG)' field containers key | sed 's/^.*: *//' > containers - ! '$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -c Sig.hsig -sig-of "Sig is `cat containers`:Data.Map.Strict" + ! '$(TEST_HC)' $(TEST_HC_OPTS) -c Sig.hsig -sig-of "Sig is `cat containers`:Data.Map.Strict" |