diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-05-25 13:24:34 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2016-05-27 22:49:29 +0200 |
| commit | d40682ec74d802376d7cf50f2d3612b3292b29c5 (patch) | |
| tree | cfde4072ce14677621aa99d75a59228aea5922b1 /testsuite/tests/ghci/linking | |
| parent | d0dd572b707631a104e060711faf9bd169bdc968 (diff) | |
| download | haskell-d40682ec74d802376d7cf50f2d3612b3292b29c5.tar.gz | |
Testsuite: don't use --interactive in Makefiles
Add a linter to encourage the use of `$(TEST_HC_OPTS_INTERACTIVE)`
instead of `$(TEST_HC_OPTS) --interactive -ignore-dot-ghci -v0`. It's
too easy to forget one of those flags when adding a new test.
Update submodule hpc.
Reviewed by: austin
Differential Revision: https://phabricator.haskell.org/D2265
GHC Trac Issues: #11468
Diffstat (limited to 'testsuite/tests/ghci/linking')
| -rw-r--r-- | testsuite/tests/ghci/linking/Makefile | 16 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/dyn/Makefile | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/ghci/linking/Makefile b/testsuite/tests/ghci/linking/Makefile index 12676500e4..0bbd848b9d 100644 --- a/testsuite/tests/ghci/linking/Makefile +++ b/testsuite/tests/ghci/linking/Makefile @@ -13,7 +13,7 @@ ghcilink001 : mkdir dir001 "$(TEST_HC)" -c f.c -o dir001/foo.o "$(AR)" cqs dir001/libfoo.a dir001/foo.o - echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -Ldir001 -lfoo TestLink.hs + echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -Ldir001 -lfoo TestLink.hs # Test 2: ghci -Ldir -lfoo # with dir/libfoo.so @@ -32,7 +32,7 @@ ghcilink002 : mkdir dir002 "$(TEST_HC)" -c -dynamic f.c -o dir002/foo.o "$(TEST_HC)" -no-auto-link-packages -shared -v0 -o dir002/$(call DLL,foo) dir002/foo.o - echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -Ldir002 -lfoo TestLink.hs + echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -Ldir002 -lfoo TestLink.hs # Test 3: ghci -lstdc++ # where libstdc++.so is normally found in a directory private to gcc, @@ -41,9 +41,9 @@ ghcilink002 : .PHONY: ghcilink003 ghcilink003 : ifeq "$(WINDOWS)" "YES" - echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -lstdc++-6 + echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -lstdc++-6 else - echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -lstdc++ + echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -lstdc++ endif # Test 4: @@ -72,7 +72,7 @@ ghcilink004 : # "$(TEST_HC)" -c f.c -o dir004/foo.o "$(AR)" cqs dir004/libfoo.a dir004/foo.o - echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF004) -package test TestLink.hs + echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -package-db $(LOCAL_PKGCONF004) -package test TestLink.hs # Test 5: # package P @@ -100,7 +100,7 @@ ghcilink005 : # "$(TEST_HC)" -c -dynamic f.c -o dir005/foo.o "$(TEST_HC)" -no-auto-link-packages -shared -o dir005/$(call DLL,foo) dir005/foo.o - echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF005) -package test TestLink.hs + echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -package-db $(LOCAL_PKGCONF005) -package test TestLink.hs # Test 6: # package P @@ -126,9 +126,9 @@ endif '$(GHC_PKG)' init $(LOCAL_PKGCONF006) '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF006) register $(PKG006) -v0 # - echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF006) -package test + echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -package-db $(LOCAL_PKGCONF006) -package test .PHONY: T3333 T3333: "$(TEST_HC)" -c T3333.c -o T3333.o - echo "weak_test 10" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 T3333.hs T3333.o + echo "weak_test 10" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) T3333.hs T3333.o diff --git a/testsuite/tests/ghci/linking/dyn/Makefile b/testsuite/tests/ghci/linking/dyn/Makefile index 6319f4bc7e..fd954bfa55 100644 --- a/testsuite/tests/ghci/linking/dyn/Makefile +++ b/testsuite/tests/ghci/linking/dyn/Makefile @@ -42,7 +42,7 @@ load_short_name: mkdir bin_short '$(TEST_HC)' $(MY_TEST_HC_OPTS) -odir "bin_short" -shared A.c -o "bin_short/$(call DLL,A)" rm -f bin_short/*.a - echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -L"./bin_short" -lA -v0 + echo ":q" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) -L"./bin_short" -lA .PHONY: compile_libT1407 compile_libT1407: |