[commit: ghc] master: Various testsuite fixes for 32-bit Windows (f8ecc58)
git at git.haskell.org
git at git.haskell.org
Mon Apr 3 01:13:31 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/f8ecc5847285d68055c3340ee4b4bb4a3052b966/ghc
>---------------------------------------------------------------
commit f8ecc5847285d68055c3340ee4b4bb4a3052b966
Author: Ben Gamari <ben at smart-cactus.org>
Date: Sun Apr 2 17:10:48 2017 -0400
Various testsuite fixes for 32-bit Windows
>---------------------------------------------------------------
f8ecc5847285d68055c3340ee4b4bb4a3052b966
testsuite/tests/perf/haddock/all.T | 6 ++++--
testsuite/tests/perf/should_run/all.T | 10 ++++++----
...ngw32 => T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32} | 4 ++--
...ngw32 => T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32} | 0
...ingw32 => T11223_simple_duplicate_lib.stderr-ws-32-mingw32} | 4 ++--
...ingw32 => T11223_simple_duplicate_lib.stderr-ws-64-mingw32} | 0
testsuite/tests/rts/T11223/all.T | 1 +
testsuite/tests/rts/T7037_main.c | 2 +-
8 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 65e1644..4de07f4 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -40,12 +40,13 @@ test('haddock.base',
# 2017-02-17: 38425793776 (x86_64/Linux) - Generalize kind of (->)
# 2017-02-12: 25592972912 (x86_64/Linux) - Type-indexed Typeable
- ,(platform('i386-unknown-mingw32'), 4434804940, 5)
+ ,(platform('i386-unknown-mingw32'), 2885173512, 5)
# 2013-02-10: 3358693084 (x86/Windows)
# 2013-11-13: 3097751052 (x86/Windows, 64bit machine)
# 2014-04-04: 3548581572 (x86/Windows, 64bit machine)
# 2014-12-01: 4202377432 (x86/Windows, 64bit machine)
# 2015-01-20: 4434804940 (x86/Windows, 64bit machine)
+ # 2017-04-02: 2885173512 update
,(wordsize(32), 3819657568, 5)])
# 2012-08-14: 3046487920 (x86/OSX)
@@ -150,12 +151,13 @@ test('haddock.compiler',
# 2017-02-11: 62070477608 (amd64/Linux) OccurAnal / One-Shot (#13227) (and others)
# 2017-02-25: 55777283352 (amd64/Linux) Early inline patch
- ,(platform('i386-unknown-mingw32'), 902576468, 10)
+ ,(platform('i386-unknown-mingw32'), 367546388, 10)
# 2012-10-30: 13773051312 (x86/Windows)
# 2013-02-10: 14925262356 (x86/Windows)
# 2013-11-13: 14328363592 (x86/Windows, 64bit machine)
# 2014-12-01: 104140852 (x86/Windows, sudden shrinkage!)
# 2014-12-10: 217933548 increased again
+ # 2017-04-02: 367546388 update
,(wordsize(32), 118738876, 5)])
# 2012-08-14: 13471797488 (x86/OSX)
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 49a6656..0451348 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -111,6 +111,7 @@ test('T876',
[(platform('x86_64-unknown-mingw32'), 66928, 5),
# 2015-04-03: 71904 (amd64/Windows, unknown cause)
# 2016-11-27: 66928 (amd64/Windows, unknown cause)
+
(wordsize(64), 58128, 5),
# 2013-02-14: 1263712 (x86_64/Linux)
# 2014-02-10: 63216 (x86_64/Linux), call arity analysis
@@ -344,10 +345,11 @@ test('T7436',
# 127000 (amd64/Linux)
# 2013-02-07: 60360 (amd64/Linux)
# 2015-04-03: Widen 1->4% (amd64/Windows was doing better)
- (wordsize(32), 42772, 1)]),
- # 2013-02-10: 58032 (x86/Windows)
- # 2013-02-10: 58836 (x86/OSX)
- # 2017-03-24: 42772 (x86/Linux, 64-bit machine) no idea why
+ (wordsize(32), 42772, 4)]),
+ # 2013-02-10: 58032 (x86/Windows)
+ # 2013-02-10: 58836 (x86/OSX)
+ # 2017-03-24: 42772 (x86/Linux, 64-bit machine) no idea why
+ # 2017-04-02: Widen 1->4% (i386/Windows was doing better)
only_ways(['normal'])
],
compile_and_run,
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-ws-32-mingw32
similarity index 92%
copy from testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32
copy to testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-32-mingw32
index 1fea3e2..73d736c 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-ws-32-mingw32
@@ -1,5 +1,5 @@
GHC runtime linker: fatal error: I found a duplicate definition for symbol
- a
+ _a
whilst processing object file
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
@@ -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.exe: ^^ Could not load 'c', dependency unresolved. See top entry above.
+ghc-stage2.exe: ^^ 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-ws-64-mingw32
similarity index 100%
rename from testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-mingw32
rename to testsuite/tests/rts/T11223/T11223_link_order_a_b_2_fail.stderr-ws-64-mingw32
diff --git a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32 b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
similarity index 92%
copy from testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32
copy to testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
index 4d4656f..48245cc 100644
--- a/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32
+++ b/testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-32-mingw32
@@ -1,5 +1,5 @@
GHC runtime linker: fatal error: I found a duplicate definition for symbol
- a
+ _a
whilst processing object file
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
@@ -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.exe: ^^ Could not load 'c', dependency unresolved. See top entry above.
+ghc-stage2.exe: ^^ 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-ws-64-mingw32
similarity index 100%
rename from testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-mingw32
rename to testsuite/tests/rts/T11223/T11223_simple_duplicate_lib.stderr-ws-64-mingw32
diff --git a/testsuite/tests/rts/T11223/all.T b/testsuite/tests/rts/T11223/all.T
index 0a578c0..6656e7f 100644
--- a/testsuite/tests/rts/T11223/all.T
+++ b/testsuite/tests/rts/T11223/all.T
@@ -34,6 +34,7 @@ test('T11223_simple_duplicate',
test('T11223_simple_duplicate_lib',
[extra_files(['bar.c', 'foo.c', 'foo.hs']),
+ when(platform('i386-unknown-mingw32'), expect_broken(13515)),
when(ghc_dynamic(), skip), normalise_errmsg_fun(normalise_duplicate_errmsg)],
run_command,
['$MAKE -s --no-print-directory t_11223_simple_duplicate_lib'])
diff --git a/testsuite/tests/rts/T7037_main.c b/testsuite/tests/rts/T7037_main.c
index ce7fa65..b85b98e 100644
--- a/testsuite/tests/rts/T7037_main.c
+++ b/testsuite/tests/rts/T7037_main.c
@@ -2,6 +2,6 @@
#include <unistd.h>
int main(int argc, char *argv[]) {
- T7037_CONST char * args[2] = {"T7037", NULL};
+ char * T7037_CONST args[2] = {"T7037", NULL};
execv("./T7037", args);
}
More information about the ghc-commits
mailing list