diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2016-06-18 22:08:53 +0200 |
---|---|---|
committer | Thomas Miedema <thomasmiedema@gmail.com> | 2016-06-20 16:22:07 +0200 |
commit | cf6e65693588cd9d40c895279f2e53d3d25a2c58 (patch) | |
tree | 7888c54bbd8548293a51e836bbd16de70c3b7616 /testsuite/tests/rts | |
parent | 9cdde38144331510673b5296b00c88fbe566adcf (diff) | |
download | haskell-cf6e65693588cd9d40c895279f2e53d3d25a2c58.tar.gz |
Testsuite: remove Windows CR [skip ci]
Diffstat (limited to 'testsuite/tests/rts')
7 files changed, 31 insertions, 31 deletions
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 51d4db5dc0..bf1685e810 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,25 +1,25 @@ -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
-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)
-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.
-
-ByteCodeLink: can't find label
-During interactive linking, GHCi couldn't find the following symbol:
- c
-This may be due to you not asking GHCi to load extra object files,
-archives or DLLs needed by your current session. Restart GHCi, specifying
-the missing library using the -L/path/to/object/dir and -lmissinglibname
-flags, or simply by naming the relevant files on the GHCi command line.
-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'
-
+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 +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) +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. + +ByteCodeLink: can't find label +During interactive linking, GHCi couldn't find the following symbol: + c +This may be due to you not asking GHCi to load extra object files, +archives or DLLs needed by your current session. Restart GHCi, specifying +the missing library using the -L/path/to/object/dir and -lmissinglibname +flags, or simply by naming the relevant files on the GHCi command line. +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_link_order_a_b_succeed.stdout b/testsuite/tests/rts/T11223/T11223_link_order_a_b_succeed.stdout index 78c6baefdd..0cfbf08886 100644 --- a/testsuite/tests/rts/T11223/T11223_link_order_a_b_succeed.stdout +++ b/testsuite/tests/rts/T11223/T11223_link_order_a_b_succeed.stdout @@ -1 +1 @@ -2
+2 diff --git a/testsuite/tests/rts/T11223/T11223_link_order_b_a_2_succeed.stdout b/testsuite/tests/rts/T11223/T11223_link_order_b_a_2_succeed.stdout index 110fbf1042..9183bf03fc 100644 --- a/testsuite/tests/rts/T11223/T11223_link_order_b_a_2_succeed.stdout +++ b/testsuite/tests/rts/T11223/T11223_link_order_b_a_2_succeed.stdout @@ -1 +1 @@ -256
+256 diff --git a/testsuite/tests/rts/T11223/T11223_link_order_b_a_succeed.stdout b/testsuite/tests/rts/T11223/T11223_link_order_b_a_succeed.stdout index e0e1028e60..b8626c4cff 100644 --- a/testsuite/tests/rts/T11223/T11223_link_order_b_a_succeed.stdout +++ b/testsuite/tests/rts/T11223/T11223_link_order_b_a_succeed.stdout @@ -1 +1 @@ -4
+4 diff --git a/testsuite/tests/rts/T11223/T11223_simple_link.stdout b/testsuite/tests/rts/T11223/T11223_simple_link.stdout index 78c5a0adb2..900731ffd5 100644 --- a/testsuite/tests/rts/T11223/T11223_simple_link.stdout +++ b/testsuite/tests/rts/T11223/T11223_simple_link.stdout @@ -1 +1 @@ -64
+64 diff --git a/testsuite/tests/rts/T11223/T11223_simple_link_lib.stdout b/testsuite/tests/rts/T11223/T11223_simple_link_lib.stdout index 78c5a0adb2..900731ffd5 100644 --- a/testsuite/tests/rts/T11223/T11223_simple_link_lib.stdout +++ b/testsuite/tests/rts/T11223/T11223_simple_link_lib.stdout @@ -1 +1 @@ -64
+64 diff --git a/testsuite/tests/rts/T11223/T11223_simple_unused_duplicate_lib.stdout b/testsuite/tests/rts/T11223/T11223_simple_unused_duplicate_lib.stdout index 78c5a0adb2..900731ffd5 100644 --- a/testsuite/tests/rts/T11223/T11223_simple_unused_duplicate_lib.stdout +++ b/testsuite/tests/rts/T11223/T11223_simple_unused_duplicate_lib.stdout @@ -1 +1 @@ -64
+64 |