Testsuite: small test cleanups
authorThomas Miedema <thomasmiedema@gmail.com>
Thu, 16 Jul 2015 15:41:56 +0000 (17:41 +0200)
committerThomas Miedema <thomasmiedema@gmail.com>
Fri, 17 Jul 2015 23:01:53 +0000 (01:01 +0200)
* 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

testsuite/.gitignore
testsuite/tests/annotations/should_run/Makefile
testsuite/tests/ghc-e/Makefile [new file with mode: 0644]
testsuite/tests/rts/Makefile

index 3583a06..d4ef22b 100644 (file)
@@ -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
 
 # -----------------------------------------------------------------------------
index 71e065f..49339a5 100644 (file)
@@ -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 (file)
index 0000000..9a36a1c
--- /dev/null
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
index 644d741..5e5782a 100644 (file)
@@ -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: