diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-06-24 20:45:04 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2016-06-29 18:20:51 +0200 |
| commit | 1084d3755cac6ccd90f8decc0d79c315387ae388 (patch) | |
| tree | a71d2acd5aa581d9c4edea6969edc3d0afc3447f /testsuite/tests/cabal/cabal03/Makefile | |
| parent | 8f7194fae23bdc6db72fc5784933f50310ce51f9 (diff) | |
| download | haskell-1084d3755cac6ccd90f8decc0d79c315387ae388.tar.gz | |
Testsuite: use ignore_stderr/stdout instead of ignore_output
The problem with ignore_output is that it hides errors for WAY=ghci.
GHCi always returns with exit code 0 (unless it is broken itself).
For example: ghci015 must have been failing with compile errors for
years, but we didn't notice because all output was ignored.
Therefore, replace all uses of ignore_output with either ignore_stderr
or ignore_stdout. In some cases I opted for adding the expected output.
Update submodule hpc and stm.
Reviewed by: simonmar
Differential Revision: https://phabricator.haskell.org/D2367
Diffstat (limited to 'testsuite/tests/cabal/cabal03/Makefile')
| -rw-r--r-- | testsuite/tests/cabal/cabal03/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/tests/cabal/cabal03/Makefile b/testsuite/tests/cabal/cabal03/Makefile index fbd02c553d..93589e89b0 100644 --- a/testsuite/tests/cabal/cabal03/Makefile +++ b/testsuite/tests/cabal/cabal03/Makefile @@ -6,9 +6,9 @@ include $(TOP)/mk/test.mk SETUP=../Setup -v0 # This test is for overlapping/shadowing packages with Cabal. We -# 1. install p-1.0 to the global DB -# 2. install q-1.0 (depending on p-1.0) to a temporary DB -# 3. install a differnet p-1.0 to the temp DB +# 1. install p-1.0 +# 2. install q-1.0 (depending on p-1.0) +# 3. install a different p-1.0 # 4. attempt to configure and buidl r, which depends on p-1.0 and q-1.0 # # step 4 will elicit a warning from Cabal's configure step that the @@ -30,7 +30,7 @@ cabal03: clean cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force --ipid p-withopt cd p && $(SETUP) build cd p && $(SETUP) register - cd r && ! ../Setup configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force + cd r && ! ../Setup configure -v0 $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force ifneq "$(CLEANUP)" "" $(MAKE) -s --no-print-directory clean endif |