diff options
| author | Tamar Christina <tamar@zhox.com> | 2015-10-03 18:37:29 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-10-03 18:37:30 +0200 |
| commit | c4d7df04aa8b7270759f4c39dceadfd26339b6a6 (patch) | |
| tree | a4ceb170f239e446fdd3cf36a5ea7934b6963dde /testsuite | |
| parent | b6f76b9aaca49df0fb06d8bad2f7edc5b5b8c095 (diff) | |
| download | haskell-c4d7df04aa8b7270759f4c39dceadfd26339b6a6.tar.gz | |
Fix broken validation Build 6564 and accepting a few other test results
Test Plan: ./validate
Reviewers: thomie, austin, bgamari
Reviewed By: bgamari
Subscribers: #ghc_windows_task_force
Differential Revision: https://phabricator.haskell.org/D1304
Diffstat (limited to 'testsuite')
4 files changed, 16 insertions, 11 deletions
diff --git a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 b/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 index 9fe325728e..898dc7a5c4 100644 --- a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 +++ b/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 @@ -1,6 +1,7 @@ -[1 of 3] Compiling A ( A.hs, tmp_sigof01m\A.o ) -[2 of 3] Compiling B[sig of A] ( B.hsig, nothing ) -[3 of 3] Compiling Main ( Main.hs, tmp_sigof01m\Main.o ) +[1 of 4] Compiling A ( A.hs, tmp_sigof01m\A.o ) +[2 of 4] Compiling B[boot] ( B.hs-boot, tmp_sigof01m\B.o-boot ) +[3 of 4] Compiling B[merge] ( B.hi, tmp_sigof01m\B.o ) +[4 of 4] Compiling Main ( Main.hs, tmp_sigof01m\Main.o ) Linking tmp_sigof01m/Main.exe ... False T diff --git a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 index 3c8a1fa00c..7fde989bc4 100644 --- a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 +++ b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 @@ -1,6 +1,8 @@ -[1 of 3] Compiling MapAsSet[sig of Data.Map.Lazy] ( MapAsSet.hsig, nothing ) -[2 of 3] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing ) -[3 of 3] Compiling Main ( Double.hs, tmp_sigof02dm\Main.o ) +[1 of 5] Compiling MapAsSet[boot] ( MapAsSet.hs-boot, tmp_sigof02dm\MapAsSet.o-boot ) +[2 of 5] Compiling MapAsSet[merge] ( MapAsSet.hi, tmp_sigof02dm\MapAsSet.o ) +[3 of 5] Compiling Map[boot] ( Map.hs-boot, tmp_sigof02dm\Map.o-boot ) +[4 of 5] Compiling Map[merge] ( Map.hi, tmp_sigof02dm\Map.o ) +[5 of 5] Compiling Main ( Double.hs, tmp_sigof02dm\Main.o ) Linking tmp_sigof02dm/Double.exe ... False fromList [0,6] diff --git a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 index 65b1857c49..f7cca89866 100644 --- a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 +++ b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 @@ -1,8 +1,10 @@ -[1 of 2] Compiling Map[sig of Data.Map.Strict] ( Map.hsig, nothing ) -[2 of 2] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) +[1 of 3] Compiling Map[boot] ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) +[2 of 3] Compiling Map[merge] ( Map.hi, tmp_sigof02m\Map.o ) +[3 of 3] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) Linking tmp_sigof02m/StrictMain.exe ... -[1 of 2] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing ) [sig-of changed] -[2 of 2] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) [Map changed] +[1 of 3] Compiling Map[boot] ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) [sig-of changed] +[2 of 3] Compiling Map[merge] ( Map.hi, tmp_sigof02m\Map.o ) [sig-of changed] +[3 of 3] Compiling Main ( Main.hs, tmp_sigof02m\Main.o ) [Map changed] Linking tmp_sigof02m/LazyMain.exe ... False [(0,"foo"),(6,"foo")] diff --git a/testsuite/tests/parser/should_fail/T8430.stderr b/testsuite/tests/parser/should_fail/T8430.stderr index 31e69baac7..5bfc8a40c0 100644 --- a/testsuite/tests/parser/should_fail/T8430.stderr +++ b/testsuite/tests/parser/should_fail/T8430.stderr @@ -1,3 +1,3 @@ T8430.lhs line 3: unlit: spurious \end{code} -`/mnt/work/ghc/ghc-testing/inplace/lib/unlit' failed in phase `Literate pre-processor'. (Exit code: 1) +`unlit' failed in phase `Literate pre-processor'. (Exit code: 1) |