diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2017-02-20 11:11:03 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-02-20 13:33:45 -0500 |
| commit | 087dbbedc4caaf96cd92d88f3c334fbf912658c3 (patch) | |
| tree | 0f0b7d9a4ade31fdfbad3a12d3ed78afb1ae8baf /testsuite | |
| parent | 27a2854124cc1c101570104501beea234a4ee921 (diff) | |
| download | haskell-087dbbedc4caaf96cd92d88f3c334fbf912658c3.tar.gz | |
Bump Cabal submodule
We are now tracking the 2.0 branch.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout | 10 | ||||
| -rw-r--r-- | testsuite/tests/cabal/cabal03/cabal03.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/driver/recomp007/recomp007.stdout | 3 | ||||
| -rw-r--r-- | testsuite/tests/th/T10796b.stderr | 6 |
4 files changed, 13 insertions, 10 deletions
diff --git a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout index 2d219b0b68..2f17fdffcd 100644 --- a/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout +++ b/testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout @@ -1,4 +1,6 @@ -Preprocessing library 'bkpcabal01-0.1.0.0-JzlnBa7joVSAwW36Ug1T14-p' for -bkpcabal01-0.1.0.0... -Preprocessing library 'bkpcabal01-0.1.0.0-JzlnBa7joVSAwW36Ug1T14-q' for -bkpcabal01-0.1.0.0... +Preprocessing library 'p' for bkpcabal01-0.1.0.0.. +Building library 'p' instantiated with H = <H> +for bkpcabal01-0.1.0.0.. +Preprocessing library 'q' for bkpcabal01-0.1.0.0.. +Building library 'q' instantiated with H = <H> +for bkpcabal01-0.1.0.0.. diff --git a/testsuite/tests/cabal/cabal03/cabal03.stderr b/testsuite/tests/cabal/cabal03/cabal03.stderr index 81b3e4b10b..42821bac89 100644 --- a/testsuite/tests/cabal/cabal03/cabal03.stderr +++ b/testsuite/tests/cabal/cabal03/cabal03.stderr @@ -1,3 +1,3 @@ -Setup: The following packages are broken because other packages they depend on -are missing. These broken packages must be rebuilt before they can be used. +Error: + The following packages are broken because other packages they depend on are missing. These broken packages must be rebuilt before they can be used. installed package q-1.0 is broken due to missing package p-noopt diff --git a/testsuite/tests/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout index 6230acfb02..d8343152e0 100644 --- a/testsuite/tests/driver/recomp007/recomp007.stdout +++ b/testsuite/tests/driver/recomp007/recomp007.stdout @@ -1,4 +1,5 @@ -Preprocessing executable 'test' for b-1.0... +Preprocessing executable 'test' for b-1.0.. +Building executable 'test' for b-1.0.. [1 of 2] Compiling B ( B.hs, dist/build/test/test-tmp/B.o ) [A changed] [2 of 2] Compiling Main ( Main.hs, dist/build/test/test-tmp/Main.o ) [B changed] Linking dist/build/test/test ... diff --git a/testsuite/tests/th/T10796b.stderr b/testsuite/tests/th/T10796b.stderr index 1dd5110bbf..eff1f75f7c 100644 --- a/testsuite/tests/th/T10796b.stderr +++ b/testsuite/tests/th/T10796b.stderr @@ -1,5 +1,5 @@ T10796b.hs:8:17: error: - Can't construct a pattern from name Data.Set.Base.fromList - In the untyped splice: - $(dataToPatQ (const Nothing) (fromList "test")) + • Can't construct a pattern from name Data.Set.Base.fromList + • In the untyped splice: + $(dataToPatQ (const Nothing) (fromList "test")) |