[commit: ghc] master: Revert "T1969: Enable it again but bump the max residency temporarily" (d610274)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d61027438102e212c47721306d4f294278e95b57/ghc

>---------------------------------------------------------------

commit d61027438102e212c47721306d4f294278e95b57
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Aug 17 21:48:57 2016 +0100

    Revert "T1969: Enable it again but bump the max residency temporarily"
    
    This reverts commit 773e3aadac4bbee9a0173ebc90ffdc9458a2a3a9.


>---------------------------------------------------------------

d61027438102e212c47721306d4f294278e95b57
 testsuite/tests/perf/compiler/all.T | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 4aff4fb..e9e2493 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -28,7 +28,8 @@ setTestOpts(no_lint)
 #    really changed, then you know there's an issue.
 
 test('T1969',
-     [compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
+     [expect_broken(12437),
+      compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
           [(wordsize(32), 30, 15),
              # 2010-05-17 14 (x86/Windows)
              #            15 (x86/OS X)
@@ -64,7 +65,7 @@ test('T1969',
              # 2014-06-29 5949188 (x86/Linux)
              # 2015-07-11 6241108 (x86/Linux, 64bit machine) use +RTS -G1
              # 2016-04-06 9093608 (x86/Linux, 64bit machine)
-           (wordsize(64), 15017528, 20)]),
+           (wordsize(64), 15017528, 15)]),
              # 2014-09-10 10463640, 10  # post-AMP-update (somewhat stabelish)
                # looks like the peak is around ~10M, but we're
                # unlikely to GC exactly on the peak.