summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorTamar Christina <tamar@zhox.com>2017-02-01 06:41:48 +0000
committerTamar Christina <tamar@zhox.com>2017-02-01 09:04:02 +0000
commitf66030656f47ed9917d7ec6a5f80b37ec6507396 (patch)
treeeac393ba675b111b154e7d633fc1d870ea4fcc29 /testsuite
parent99e920c1287e0b11892b47078e8d0dfabef8e0f2 (diff)
downloadhaskell-f66030656f47ed9917d7ec6a5f80b37ec6507396.tar.gz
Update output of failing 11223 tests
Summary: make accept new test output Test Plan: make test TEST="T11223_link_order_a_b_2_fail T11223_simple_duplicate_lib" Reviewers: austin, bgamari, simonmar Reviewed By: simonmar Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D3053
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr2
-rw-r--r--testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw328
-rw-r--r--testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr2
-rw-r--r--testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw328
4 files changed, 10 insertions, 10 deletions
diff --git a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr
index b7079a6352..fdb91d14c3 100644
--- a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr
+++ b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr
@@ -9,7 +9,7 @@ This could be caused by:
* Specifying the same object file twice on the GHCi command line
* An incorrect `package.conf' entry, causing some object to be
loaded twice.
-ghc-stage2: Could not on-demand load symbol 'c'
+ghc-stage2: ^^ Could not load 'c', dependency unresolved. See top entry above.
ByteCodeLink: can't find label
diff --git a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32 b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32
index bf1685e810..1fea3e2079 100644
--- a/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32
@@ -1,14 +1,16 @@
GHC runtime linker: fatal error: I found a duplicate definition for symbol
a
whilst processing object file
- E:/msys64/home/Tamar/ghc2/testsuite/tests/rts/T11223\libfoo_link_lib_3.a
+ E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libfoo_link_lib_3.a
The symbol was previously defined in
- E:/msys64/home/Tamar/ghc2/testsuite/tests/rts/T11223\libbar_link_lib_3.a(bar_link_lib_3.o)
+ E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_link_order_a_b_2_fail.run\libbar_link_lib_3.a(bar_link_lib_3.o)
This could be caused by:
* Loading two different object files which export the same symbol
* Specifying the same object file twice on the GHCi command line
* An incorrect `package.conf' entry, causing some object to be
loaded twice.
+ghc-stage2.exe: ^^ Could not load 'c', dependency unresolved. See top entry above.
+
ByteCodeLink: can't find label
During interactive linking, GHCi couldn't find the following symbol:
@@ -21,5 +23,3 @@ Alternatively, this link failure might indicate a bug in GHCi.
If you suspect the latter, please send a bug report to:
glasgow-haskell-bugs@haskell.org
-ghc-stage2.exe: Could not on-demand load symbol 'c'
-
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr
index 0785cdc6eb..b5e9213149 100644
--- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr
+++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr
@@ -9,7 +9,7 @@ This could be caused by:
* Specifying the same object file twice on the GHCi command line
* An incorrect `package.conf' entry, causing some object to be
loaded twice.
-ghc-stage2: Could not on-demand load symbol 'c'
+ghc-stage2: ^^ Could not load 'c', dependency unresolved. See top entry above.
ByteCodeLink: can't find label
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32 b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32
index 151aab3817..4d4656f690 100644
--- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32
@@ -1,14 +1,16 @@
GHC runtime linker: fatal error: I found a duplicate definition for symbol
a
whilst processing object file
- E:/msys64/home/Tamar/ghc2/testsuite/tests/rts/T11223\libfoo_dup_lib.a
+ E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_simple_duplicate_lib.run\libfoo_dup_lib.a
The symbol was previously defined in
- bar_dup_lib.o
+ E:\ghc-dev\msys64\home\Tamar\ghc\testsuite\tests\rts\T11223\T11223_simple_duplicate_lib.run\bar_dup_lib.o
This could be caused by:
* Loading two different object files which export the same symbol
* Specifying the same object file twice on the GHCi command line
* An incorrect `package.conf' entry, causing some object to be
loaded twice.
+ghc-stage2.exe: ^^ Could not load 'c', dependency unresolved. See top entry above.
+
ByteCodeLink: can't find label
During interactive linking, GHCi couldn't find the following symbol:
@@ -21,5 +23,3 @@ Alternatively, this link failure might indicate a bug in GHCi.
If you suspect the latter, please send a bug report to:
glasgow-haskell-bugs@haskell.org
-ghc-stage2.exe: Could not on-demand load symbol 'c'
-