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/driver | |
| 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/driver')
| -rw-r--r-- | testsuite/tests/driver/Makefile | 26 | ||||
| -rw-r--r-- | testsuite/tests/driver/mode001.stdout | 4 |
2 files changed, 17 insertions, 13 deletions
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile index 8c986817b0..51fb71a39b 100644 --- a/testsuite/tests/driver/Makefile +++ b/testsuite/tests/driver/Makefile @@ -432,16 +432,20 @@ T2566:: # ghc: <stdout>: hFlush: resource vanished (Broken pipe) # on OS X mode001: - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make --help | sed '2,$$d' - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --make | sed '2,$$d' - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --help -ignore-dot-ghci | sed '2,$$d' - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --interactive -ignore-dot-ghci | sed '2,$$d' - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --version --help | sed "s/, version.*//" - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --help --version | sed '2,$$d' - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --version -ignore-dot-ghci | sed "s/, version.*//" - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --version --interactive -ignore-dot-ghci | sed "s/, version.*//" - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive --show-options -ignore-dot-ghci | grep -- --interactive | sed '2,$$d' - "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --show-options --interactive -ignore-dot-ghci | grep -- --interactive | sed '2,$$d' + "$(TEST_HC)" $(TEST_HC_OPTS) --make --help | sed '2,$$d' + "$(TEST_HC)" $(TEST_HC_OPTS) --help --make | sed '2,$$d' + + "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) --help | sed '2,$$d' + "$(TEST_HC)" --help $(TEST_HC_OPTS_INTERACTIVE) | sed '2,$$d' + + "$(TEST_HC)" $(TEST_HC_OPTS) --version --help | sed "s/, version.*//" + "$(TEST_HC)" $(TEST_HC_OPTS) --help --version | sed '2,$$d' + + "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) --version | sed "s/, version.*//" + "$(TEST_HC)" --version $(TEST_HC_OPTS_INTERACTIVE) | sed "s/, version.*//" + + "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) --show-options | grep -- --show-options | sed '2,$$d' + "$(TEST_HC)" --show-options $(TEST_HC_OPTS_INTERACTIVE) | grep -- --show-options | sed '2,$$d' # Test for building DLLs with ghc -shared, see #2745 shared001: @@ -503,7 +507,7 @@ T706: "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) $(ghciWayFlags) -c T706.hs cp T706b.hs T706.hs "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) $(ghciWayFlags) -c T706.hs - echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --interactive -ignore-dot-ghci -v0 T706 + echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS_INTERACTIVE) T706 .PHONY: T5584 T5584: diff --git a/testsuite/tests/driver/mode001.stdout b/testsuite/tests/driver/mode001.stdout index e94602d96e..3fa84ad13b 100644 --- a/testsuite/tests/driver/mode001.stdout +++ b/testsuite/tests/driver/mode001.stdout @@ -6,5 +6,5 @@ The Glorious Glasgow Haskell Compilation System Usage: The Glorious Glasgow Haskell Compilation System The Glorious Glasgow Haskell Compilation System ---interactive ---interactive +--show-options +--show-options |