diff options
| -rw-r--r-- | testsuite/.gitignore | 5 | ||||
| -rw-r--r-- | testsuite/tests/annotations/should_run/Makefile | 1 | ||||
| -rw-r--r-- | testsuite/tests/ghc-e/Makefile | 3 | ||||
| -rw-r--r-- | testsuite/tests/rts/Makefile | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/testsuite/.gitignore b/testsuite/.gitignore index 3583a062af..d4ef22bf5c 100644 --- a/testsuite/.gitignore +++ b/testsuite/.gitignore @@ -55,9 +55,8 @@ tmp.d *.so *bindisttest_install___dir_bin_ghc.mk *bindisttest_install___dir_bin_ghc.exe.mk -mk/ghcconfig*_inplace_bin_ghc-stage1.mk -mk/ghcconfig*_inplace_bin_ghc-stage2.mk -mk/ghcconfig*_inplace_bin_ghc-stage2.exe.mk +mk/ghcconfig*_bin_ghc-*.mk +mk/ghcconfig*_bin_ghc-*.exe.mk *.imports # ----------------------------------------------------------------------------- diff --git a/testsuite/tests/annotations/should_run/Makefile b/testsuite/tests/annotations/should_run/Makefile index 71e065f76b..49339a5d1e 100644 --- a/testsuite/tests/annotations/should_run/Makefile +++ b/testsuite/tests/annotations/should_run/Makefile @@ -6,7 +6,6 @@ CONFIG_HS=Config.hs config : rm -f $(CONFIG_HS) - @echo "Creating $(CONFIG_HS) ... " echo "module Config where" >>$(CONFIG_HS) echo "cTop :: String" >> $(CONFIG_HS) echo 'cTop = "$(subst \,\\,$(shell '$(TEST_HC)' --print-libdir))"' >> $(CONFIG_HS) diff --git a/testsuite/tests/ghc-e/Makefile b/testsuite/tests/ghc-e/Makefile new file mode 100644 index 0000000000..9a36a1c5fe --- /dev/null +++ b/testsuite/tests/ghc-e/Makefile @@ -0,0 +1,3 @@ +TOP=../.. +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/test.mk diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile index 644d74110e..5e5782a3cb 100644 --- a/testsuite/tests/rts/Makefile +++ b/testsuite/tests/rts/Makefile @@ -19,7 +19,7 @@ outofmem2:: T2615-prep: $(RM) libfoo_T2615.so '$(TEST_HC)' $(TEST_HC_OPTS) -fPIC -c libfoo_T2615.c -o libfoo_T2615.o - '$(TEST_HC)' $(TEST_HC_OPTS) -shared -no-auto-link-packages libfoo_T2615.o -o libfoo_T2615.so + '$(TEST_HC)' $(filter-out -rtsopts, $(TEST_HC_OPTS)) -shared -no-auto-link-packages libfoo_T2615.o -o libfoo_T2615.so .PHONY: T4059 T4059: |