diff --git a/ghc/tests/README b/ghc/tests/README index 0054e5deb6a34bf0d06b17329caa33f1b1cc77db..88975d196e98bf7293b2fbcf4d1091d5d988eb67 100644 --- a/ghc/tests/README +++ b/ghc/tests/README @@ -35,9 +35,10 @@ options. For example, tc093_HC_OPTS = -noC -ddump-tc --noC tells not bother generating any C (not point in doing that, since we -only want to test the typechecker). -ddump-tc tells ghc to dump the -typechecker state. +-noC tells not bother generating any C (no point in doing that, since +we only want to test the typechecker. NOTE: Currently the driver does +not handle the -noC flag anymore). -ddump-tc tells ghc to dump the +typechecker state. Depending on the tests/ subdirectory, a default exit code is expected from all tests therein, normally 0 (==success). diff --git a/ghc/tests/ccall/should_compile/Makefile b/ghc/tests/ccall/should_compile/Makefile index 7c553f50c72375d4a291f9c25f8eff224dcc69aa..a56869f13de25c426521ebddef557e32b5fd5eb9 100644 --- a/ghc/tests/ccall/should_compile/Makefile +++ b/ghc/tests/ccall/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint -fglasgow-exts +SRC_HC_OPTS += -dcore-lint -fglasgow-exts # Note that these tests are still in a state of flux... don't believe errors # they report. In fact, these aren't really very good tests at all... diff --git a/ghc/tests/ccall/should_fail/Makefile b/ghc/tests/ccall/should_fail/Makefile index 108ff21cffd1e3896ece3d850adf487e558652ac..ac50886e9395c138f55767468fecdbbf5005cd93 100644 --- a/ghc/tests/ccall/should_fail/Makefile +++ b/ghc/tests/ccall/should_fail/Makefile @@ -2,6 +2,6 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_fail.mk -SRC_HC_OPTS += -noC -fglasgow-exts +SRC_HC_OPTS += -fglasgow-exts include $(TOP)/mk/target.mk diff --git a/ghc/tests/deSugar/should_compile/Makefile b/ghc/tests/deSugar/should_compile/Makefile index 0bd45f5dcf68bbaf28653eed68e4fba4311f05bb..baa35fb42b67d622e1e539ada28240a00f4bd5e8 100644 --- a/ghc/tests/deSugar/should_compile/Makefile +++ b/ghc/tests/deSugar/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint +SRC_HC_OPTS += -dcore-lint ds035_HC_OPTS = -fglasgow-exts ds044_HC_OPTS = -O -funbox-strict-fields diff --git a/ghc/tests/deriving/should_compile/Makefile b/ghc/tests/deriving/should_compile/Makefile index fe63d607607d9cf7f527dc3fd7d2b3881763c164..d2bdb36662baef6b1f1bcf7fe51bddb09ab93dae 100644 --- a/ghc/tests/deriving/should_compile/Makefile +++ b/ghc/tests/deriving/should_compile/Makefile @@ -2,6 +2,6 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint -nohi +SRC_HC_OPTS += -dcore-lint -nohi include $(TOP)/mk/target.mk diff --git a/ghc/tests/deriving/should_fail/Makefile b/ghc/tests/deriving/should_fail/Makefile index 814df45b4e30b4209fcfb3dadca2423cf0314b1f..c2170a41a158ef77cfded3b480abb31e64557fd9 100644 --- a/ghc/tests/deriving/should_fail/Makefile +++ b/ghc/tests/deriving/should_fail/Makefile @@ -2,6 +2,4 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_fail.mk -SRC_HC_OPTS += -noC - include $(TOP)/mk/target.mk diff --git a/ghc/tests/printing/should_compile/Makefile b/ghc/tests/printing/should_compile/Makefile index c4140f28ae887bebdd95fa6e098ac7525057e761..14876ec688c5a66ad39a2632fc5dbbe37db55aaf 100644 --- a/ghc/tests/printing/should_compile/Makefile +++ b/ghc/tests/printing/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint -hi-with-declarations -hi-with-exports -hi-with-instances -hi-with-fixities -ddump-tc +SRC_HC_OPTS += -dcore-lint -hi-with-declarations -hi-with-exports -hi-with-instances -hi-with-fixities -ddump-tc print002_HC_OPTS = -fno-implicit-prelude diff --git a/ghc/tests/reader/should_compile/Makefile b/ghc/tests/reader/should_compile/Makefile index c1b1008769f814d039a64dbfee0017b4359aeae9..ac9ca82eed18a2881f0cd450234313ecaf6f28ac 100644 --- a/ghc/tests/reader/should_compile/Makefile +++ b/ghc/tests/reader/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint +SRC_HC_OPTS += -dcore-lint read012_HC_OPTS += -O -funfold-casms-in-hi-file -fglasgow-exts -ohi T1.hi read013_HC_OPTS += -O -funfold-casms-in-hi-file -fglasgow-exts diff --git a/ghc/tests/reader/should_fail/Makefile b/ghc/tests/reader/should_fail/Makefile index 389a4ca73e5405ea583d06d75621a0a019860d0a..3bedd7018f167bb796fdfe2df72300bcaf2b1bb5 100644 --- a/ghc/tests/reader/should_fail/Makefile +++ b/ghc/tests/reader/should_fail/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_fail.mk -SRC_HC_OPTS += -noC -ddump-parsed +SRC_HC_OPTS += -ddump-parsed read013_HC_OPTS += -fglasgow-exts diff --git a/ghc/tests/rename/should_fail/Makefile b/ghc/tests/rename/should_fail/Makefile index 814df45b4e30b4209fcfb3dadca2423cf0314b1f..c2170a41a158ef77cfded3b480abb31e64557fd9 100644 --- a/ghc/tests/rename/should_fail/Makefile +++ b/ghc/tests/rename/should_fail/Makefile @@ -2,6 +2,4 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_fail.mk -SRC_HC_OPTS += -noC - include $(TOP)/mk/target.mk diff --git a/ghc/tests/stranal/should_compile/Makefile b/ghc/tests/stranal/should_compile/Makefile index 8707162b8e86b260477fe56459487fab2ae8ff82..17c5e920028cfe9f6692f6188dbd548f3f22a531 100644 --- a/ghc/tests/stranal/should_compile/Makefile +++ b/ghc/tests/stranal/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -O -dcore-lint +SRC_HC_OPTS += -O -dcore-lint str001_HC_OPTS = -hi-with-decls -hi-with-exports -hi-with-instances diff --git a/ghc/tests/typecheck/should_compile/Makefile b/ghc/tests/typecheck/should_compile/Makefile index bf34049977cef8fc19afd3c32c10043379a217b6..95354e5fc6e8a12e9efeec2a3e3ae282bc736c49 100644 --- a/ghc/tests/typecheck/should_compile/Makefile +++ b/ghc/tests/typecheck/should_compile/Makefile @@ -2,7 +2,7 @@ TOP = ../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/should_compile.mk -SRC_HC_OPTS += -noC -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarations -hi-with-instances -hi-with-exports +SRC_HC_OPTS += -dcore-lint -fno-warn-incomplete-patterns -hi-with-declarations -hi-with-instances -hi-with-exports tc019_HC_OPTS = -fglasgow-exts tc065_HC_OPTS = -package lang -package data