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/determinism | |
| 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/determinism')
17 files changed, 34 insertions, 68 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 |