[commit: ghc] master: Testsuite: small test cleanups (ac0feec)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ac0feece3659c41d546f8e519d05e2167d3b3cc4/ghc

>---------------------------------------------------------------

commit ac0feece3659c41d546f8e519d05e2167d3b3cc4
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Jul 16 17:41:56 2015 +0200

    Testsuite: small test cleanups
    
    * don't print anything to stdout
    * add missing Makefile
    * also ignore mk/ghcconfig*.mk when using installed compiler
    * prevent warning: -rtsopts and -with-rtsopts have no effect with -shared


>---------------------------------------------------------------

ac0feece3659c41d546f8e519d05e2167d3b3cc4
 testsuite/.gitignore                            | 5 ++---
 testsuite/tests/annotations/should_run/Makefile | 1 -
 testsuite/tests/{annotations => ghc-e}/Makefile | 0
 testsuite/tests/rts/Makefile                    | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 3583a06..d4ef22b 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 71e065f..49339a5 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/annotations/Makefile b/testsuite/tests/ghc-e/Makefile
similarity index 100%
copy from testsuite/tests/annotations/Makefile
copy to testsuite/tests/ghc-e/Makefile
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
index 644d741..5e5782a 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: