From dd9ba503bd4a2b3851098a7fa69e15682ab1c536 Mon Sep 17 00:00:00 2001 From: Tamar Christina Date: Tue, 29 Nov 2016 16:58:04 -0500 Subject: Update test output for Windows Following D2684 these two tests need to be updated: * T7037: timeout.exe now waits until all processes are finished. this makes T7037 reliable. So enabled. * T876: Unknown reason, allocations are much lower than before. Test Plan: ./validate Reviewers: austin, simonmar, bgamari Reviewed By: bgamari Subscribers: thomie, #ghc_windows_task_force Differential Revision: https://phabricator.haskell.org/D2759 GHC Trac Issues: #12725, #12004 --- testsuite/tests/perf/should_run/all.T | 3 ++- testsuite/tests/rts/all.T | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T index 672ce33077..da75f42735 100644 --- a/testsuite/tests/perf/should_run/all.T +++ b/testsuite/tests/perf/should_run/all.T @@ -81,8 +81,9 @@ test('lazy-bs-alloc', test('T876', [stats_num_field('bytes allocated', - [(platform('x86_64-unknown-mingw32'), 71904, 5), + [(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 diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index f5c75875dd..9c55b21341 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -199,8 +199,7 @@ test('T6006', [ omit_ways(prof_ways + ['ghci']), compile_and_run, ['T6006_c.c -no-hs-main']) test('T7037', - [ extra_clean(['T7037_main.o','T7037_main']), - when(opsys("mingw32"), expect_broken(12725))], + [ extra_clean(['T7037_main.o','T7037_main'])], run_command, ['$MAKE -s --no-print-directory T7037']) -- cgit v1.2.1