diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-14 12:05:20 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-15 17:28:05 +0200 |
| commit | ca8544206ab723e21f55452f77aa1c5709074fe5 (patch) | |
| tree | 773e4e8b8dc976b409eb6bcab121cdfdcf69053d | |
| parent | 89060374ea0242bc2d38425ba63f33b5189325b4 (diff) | |
| download | haskell-ca8544206ab723e21f55452f77aa1c5709074fe5.tar.gz | |
Testsuite: recenter 2 performance tests on Windows
No major deviations. Also fixup T7861.
| -rw-r--r-- | testsuite/tests/perf/should_run/all.T | 6 | ||||
| -rw-r--r-- | testsuite/tests/typecheck/should_run/T7861.stderr | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T index 0fa09f433b..262f4e12fa 100644 --- a/testsuite/tests/perf/should_run/all.T +++ b/testsuite/tests/perf/should_run/all.T @@ -53,11 +53,12 @@ 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, 3), + [(wordsize(64), 431500, 3), # 489776 (amd64/Linux) # 2013-02-07: 429744 (amd64/Linux) # 2013-12-12: 425400 (amd64/Linux) # 2015-04-04: Widen 1->3% (amd64/Windows was failing) + # 2015-08-15: 431500 (Windows not good enough. avg of Windows&Linux) (wordsize(32), 411500, 2)]), # 2013-02-10: 421296 (x86/Windows) # 2013-02-10: 414180 (x86/OSX) @@ -183,10 +184,11 @@ test('T5205', [stats_num_field('bytes allocated', [(wordsize(32), 47088, 5), # expected value: 47088 (x86/Darwin) - (wordsize(64), 52600, 7)]), + (wordsize(64), 50648, 7)]), # expected value: 51320 (amd64/Linux) # 2014-07-17: 52600 (amd64/Linux) general round of updates # 2015-04-03: Widen 5->7% (amd64/Windows was doing better) + # 2015-08-15: 50648 (Windows too good. avg of Windows&Linux) only_ways(['normal', 'optasm']) ], compile_and_run, diff --git a/testsuite/tests/typecheck/should_run/T7861.stderr b/testsuite/tests/typecheck/should_run/T7861.stderr index 62b0dcda34..8ed4be26ec 100644 --- a/testsuite/tests/typecheck/should_run/T7861.stderr +++ b/testsuite/tests/typecheck/should_run/T7861.stderr @@ -1,7 +1,9 @@ T7861: T7861.hs:10:5: error: Couldn't match type ‘a’ with ‘[a]’ ‘a’ is a rigid type variable bound by - the type signature for: f :: (forall b. a) -> a at T7861.hs:9:6 + the type signature for: + f :: (forall b. a) -> a + at T7861.hs:9:6 Expected type: (forall b. a) -> a Actual type: (forall b. a) -> [a] Relevant bindings include |