Commit 9711f78f authored by Austin Seipp's avatar Austin Seipp
Browse files

Fix a couple test failures encountered when building on Windows

Summary:
* Adjusts performance tests
* Change ghcpkg05.stderr-mingw32 to match ghcpkg05.stderr

Test Plan: Ran 'sh validate' and observed fewer test failures afterwards

Reviewers: austin

Reviewed By: austin

Differential Revision: https://phabricator.haskell.org/D191
parent 918719b9
......@@ -143,8 +143,11 @@ if windows:
# msys gives "MINGW32"
# msys2 gives "MINGW_NT-6.2"
config.msys = True
# msys2 gives 'MSYS_NT-6.3' unless you set MSYSTEM, which is also needed elsewhere
elif v.startswith("MSYS"):
raise Exception("Remember to set your MSYSTEM environment variable to MINGW32 or MINGW64")
else:
raise Exception("Can't detect Windows terminal type")
raise Exception("Can't detect Windows terminal type: " + v)
# Try to use UTF8
if windows:
......
......@@ -15,4 +15,4 @@ The following packages are broken, either because they have a problem
listed above, or because they depend on a broken package.
testpkg-2.0
testpkg-3.0
ghc-pkg.exe: unregistering testpkg-2.0 would break the following packages: testpkg-3.0 (use --force to override)
ghc-pkg.exe: unregistering would break the following packages: testpkg-3.0 (use --force to override)
test('T3924',
[stats_num_field('bytes allocated',
[ (wordsize(64), 50760, 5),
[ (wordsize(64), 47080, 5),
# previously, without call-arity: 22326544
# 2014-01-18: 51480 (amd64/Linux)
# 2014-07-17: 50760 (amd64/Linux) (Roundabout adjustment)
# 2014-09-01: 47080 (amd64/Windows)
(wordsize(32), 44988, 5) ]),
# 2014-04-04: 44988 (Windows, 64-bit machine)
only_ways(['normal'])
......
......@@ -449,8 +449,9 @@ test('T9020',
[(wordsize(32), 343005716, 10),
# Original: 381360728
# 2014-07-31: 343005716 (Windows) (general round of updates)
(wordsize(64), 728263536, 10)])
(wordsize(64), 627647808, 10)])
# prev: 795469104
# 2014-07-17: 728263536 (general round of updates)
# 2014-09-01: 627647808 (SPJ compiler improvements)
],
compile,[''])
......@@ -24,7 +24,7 @@ test('haddock.base',
# 2012-11-12: 87265136 (amd64/Linux)
# 2013-01-29: 96022312 (amd64/Linux)
# 2013-10-18: 115113864 (amd64/Linux)
# 2014-07-31: 127954488 (amd64/Linux), correlates with 1ae5fa45
# 2014-07-31: 127954488 (amd64/Linux), correlates with 1ae5fa45
# 2014-08-29: 112286208 (amd64/Linux), w/w for INLINABLE things
,(platform('i386-unknown-mingw32'), 58557136, 10)
# 2013-02-10: 47988488 (x86/Windows)
......@@ -34,7 +34,7 @@ test('haddock.base',
# 2014-01-22: 62189068 (x86/Linux)
# 2014-06-29: 58243640 (x86/Linux)
,stats_num_field('bytes allocated',
[(wordsize(64), 7946284944, 5)
[(wordsize(64), 7499083776, 5)
# 2012-08-14: 5920822352 (amd64/Linux)
# 2012-09-20: 5829972376 (amd64/Linux)
# 2012-10-08: 5902601224 (amd64/Linux)
......@@ -47,6 +47,7 @@ test('haddock.base',
# 2014-06-12: 7498123680 (x86_64/Linux)
# 2014-08-05: 7992757384 (x86_64/Linux - bugfix for #314, Haddock now parses more URLs)
# 2014-08-08: 7946284944 (x86_64/Linux - Haddock updates to attoparsec-0.12.1.0)
# 2014-09-01: 7499083776 (x86_64/Windows)
,(platform('i386-unknown-mingw32'), 3548581572, 5)
# 2013-02-10: 3358693084 (x86/Windows)
# 2013-11-13: 3097751052 (x86/Windows, 64bit machine)
......@@ -74,7 +75,7 @@ test('haddock.Cabal',
# 2013-06-07: 246 (amd64/Linux) (reason unknown)
# 2013-11-21: 269
# 2013-11-22: 278 (amd64/Linux) (TH refactoring; weird)
# 2014-07-14: 309 (amd64/Linux)
# 2014-07-14: 309 (amd64/Linux)
,(platform('i386-unknown-mingw32'), 144, 10)
# 2012-10-30: 83 (x86/Windows)
# 2013-02-10: 116 (x86/Windows)
......@@ -182,7 +183,7 @@ test('haddock.compiler',
# 2012-09-18: 26882813032 (amd64/Linux)
# 2012-11-12: 25990254632 (amd64/Linux)
# 2014-07-17: 29809571376 (amd64/Linux) general round of updates
# 2012-11-27: 28708374824 (amd64/Linux)
# 2012-11-27: 28708374824 (amd64/Linux)
,(platform('i386-unknown-mingw32'), 14328363592, 10)
# 2012-10-30: 13773051312 (x86/Windows)
# 2013-02-10: 14925262356 (x86/Windows)
......
......@@ -16,10 +16,11 @@ test('T3586',
test('T4830',
[stats_num_field('bytes allocated',
[(wordsize(64), 98248, 1),
[(wordsize(64), 94496, 1),
# 127000 (amd64/Linux)
# 2013-02-07: 99264 (amd64/Linux)
# 2014-01-13: 98248 (amd64/Linux) due to #8647
# 2014-09-01: 94496 (amd64/Windows)
(wordsize(32), 70646, 3)]),
# 2013-02-10: 69744 (x86/Windows)
# 2013-02-10: 71548 (x86/OSX)
......@@ -39,10 +40,11 @@ test('lazy-bs-alloc',
[stats_num_field('peak_megabytes_allocated', (2, 1)),
# expected value: 2 (amd64/Linux)
stats_num_field('bytes allocated',
[(wordsize(64), 425400, 1),
[(wordsize(64), 438320, 1),
# 489776 (amd64/Linux)
# 2013-02-07: 429744 (amd64/Linux)
# 2013-12-12: 425400 (amd64/Linux)
# 2014-09-01: 438320 (amd64/Windows)
(wordsize(32), 411500, 2)]),
# 2013-02-10: 421296 (x86/Windows)
# 2013-02-10: 414180 (x86/OSX)
......@@ -58,9 +60,10 @@ test('lazy-bs-alloc',
test('T876',
[stats_num_field('bytes allocated',
[(wordsize(64), 63216 , 5),
[(wordsize(64), 72168 , 5),
# 2013-02-14: 1263712 (x86_64/Linux)
# 2014-02-10: 63216 (x86_64/Linux), call arity analysis
# 2014-09-01: 72168 (x86_64/Windows)
(wordsize(32), 53024, 5) ]),
# some date: 663712 (Windows, 64-bit machine)
# 2014-04-04: 56820 (Windows, 64-bit machine)
......@@ -92,9 +95,11 @@ test('T3738',
stats_num_field('bytes allocated',
[(wordsize(32), 45648, 5),
# expected value: 50520 (x86/Linux)
(wordsize(64), 49400, 5)]),
(wordsize(64), 46840, 5)]),
# 2014-09-01: 46840 (amd64/Windows)
# prev: 49400 (amd64/Linux)
# 2014-07-17: 50520 (amd64/Linux) general round of updates
only_ways(['normal'])
],
compile_and_run,
......@@ -156,9 +161,10 @@ test('T5205',
[stats_num_field('bytes allocated',
[(wordsize(32), 47088, 5),
# expected value: 47088 (x86/Darwin)
(wordsize(64), 52600, 5)]),
(wordsize(64), 48920, 5)]),
# expected value: 51320 (amd64/Linux)
# 2014-07-17: 52600 (amd64/Linux) general round of updates
# 2014-09-01: 48920 (amd64/Windows)
only_ways(['normal', 'optasm'])
],
compile_and_run,
......@@ -269,9 +275,10 @@ test('T7507', omit_ways(['ghci']), compile_and_run, ['-O'])
test('T7436',
[stats_num_field('max_bytes_used',
[(wordsize(64), 60360, 1),
[(wordsize(64), 58520, 1),
# 127000 (amd64/Linux)
# 2013-02-07: 60360 (amd64/Linux)
# 2014-09-01: 58520 (amd64/Windows)
(wordsize(32), 58434, 1)]),
# 2013-02-10: 58032 (x86/Windows)
# 2013-02-10: 58836 (x86/OSX)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment