02/02: gnu: ghc-8.6: Generally skip performance tests.

[guix-commits]

rob pushed a commit to branch wip-haskell-updates
in repository guix.

commit a0b2c3988e5e279679f2de263cf5e8ea1886c52b
Author: Robert Vollmert <address@hidden>
Date:   Wed Jul 31 10:10:47 2019 +0200

    gnu: ghc-8.6: Generally skip performance tests.
    
    * gnu/packages/haskell.scm (ghc-8.6): Skip performance tests via
    make flag.
    * gnu/packages/patches/ghc-8.6.5-skip-tests.patch: Only skip failing
    non-stat tests.
---
 gnu/packages/haskell.scm                        |   4 +
 gnu/packages/patches/ghc-8.6.5-skip-tests.patch | 108 ------------------------
 2 files changed, 4 insertions(+), 108 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 5491b09..0635376 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -616,6 +616,10 @@ interactive environment for the functional language 
Haskell.")
        ;; then complains that they don't match.
        #:build #f
 
+       #:make-flags
+       (list
+        "EXTRA_RUNTEST_OPTS=--skip-perf-tests")
+
        #:configure-flags
        (list
         (string-append "--with-gmp-libraries="
diff --git a/gnu/packages/patches/ghc-8.6.5-skip-tests.patch 
b/gnu/packages/patches/ghc-8.6.5-skip-tests.patch
index d93e5e0..764976d 100644
--- a/gnu/packages/patches/ghc-8.6.5-skip-tests.patch
+++ b/gnu/packages/patches/ghc-8.6.5-skip-tests.patch
@@ -18,111 +18,3 @@ diff -ur a/ghc-8.6.5/libraries/unix/tests/libposix/all.T 
b/ghc-8.6.5/libraries/u
 +test('posix010', [ skip, reqlib('unix') ], compile_and_run, [''])
  
  test('posix014', [ reqlib('unix') ], compile_and_run, [''])
-diff -ur a/ghc-8.6.5/testsuite/tests/perf/compiler/all.T 
b/ghc-8.6.5/testsuite/tests/perf/compiler/all.T
---- a/ghc-8.6.5/testsuite/tests/perf/compiler/all.T    2019-07-25 
10:33:31.052000000 +0200
-+++ b/ghc-8.6.5/testsuite/tests/perf/compiler/all.T    2019-07-25 
10:42:03.368000000 +0200
-@@ -28,7 +28,8 @@
- #    really changed, then you know there's an issue.
- 
- test('T1969',
--     [# expect_broken(12437),
-+     [skip,
-+      # expect_broken(12437),
-       compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
-           [(wordsize(32), 30, 15),
-              # 2010-05-17 14 (x86/Windows)
-@@ -157,7 +158,7 @@
-    conf_3294 = skip
- 
- test('T3294',
--     [
-+     [skip,
-       compiler_stats_num_field('max_bytes_used', # Note [residency]
-           [(wordsize(32), 28686588, 15),
-              #            17725476 (x86/OS X)
-@@ -405,7 +406,8 @@
-      ['$MAKE -s --no-print-directory T4007'])
- 
- test('T5030',
--     [compiler_stats_num_field('bytes allocated',
-+     [skip,
-+      compiler_stats_num_field('bytes allocated',
-           [(wordsize(32), 345668088, 10),
-            # previous:    196457520
-            # 2012-10-08:  259547660 (x86/Linux, new codegen)
-@@ -443,7 +445,8 @@
-      ['-freduction-depth=300'])
- 
- test('T5631',
--     [compiler_stats_num_field('bytes allocated',
-+     [skip,
-+      compiler_stats_num_field('bytes allocated',
-           [(wordsize(32), 570137436, 10),
-         # expected value: 392904228 (x86/Linux)
-         # 2014-04-04:     346389856 (x86 Windows, 64 bit machine)
-@@ -473,7 +476,8 @@
-      [''])
- 
- test('parsing001',
--     [compiler_stats_num_field('bytes allocated',
-+     [skip,
-+      compiler_stats_num_field('bytes allocated',
-           [(wordsize(32), 232777056, 10),
-         # Initial:        274000576
-         # 2017-03-24:     232777056
-diff -ur a/ghc-8.6.5/testsuite/tests/perf/haddock/all.T 
b/ghc-8.6.5/testsuite/tests/perf/haddock/all.T
---- a/ghc-8.6.5/testsuite/tests/perf/haddock/all.T     2019-07-25 
10:33:31.020000000 +0200
-+++ b/ghc-8.6.5/testsuite/tests/perf/haddock/all.T     2019-07-25 
10:37:18.656000000 +0200
-@@ -3,7 +3,8 @@
- # detect outliers, as described in Note [residency]. See #9556.
- 
- test('haddock.base',
--     [extra_files(['../../../../libraries/base/dist-install/haddock.t']),
-+     [skip,
-+      extra_files(['../../../../libraries/base/dist-install/haddock.t']),
-       unless(in_tree_compiler(), skip), req_haddock
-      ,stats_num_field('bytes allocated',
-           [(platform('x86_64-unknown-mingw32'), 18733710728, 5)
-@@ -76,7 +77,8 @@
-      ['haddock.t'])
- 
- test('haddock.Cabal',
--     
[extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']),
-+     [skip,
-+      
extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']),
-       unless(in_tree_compiler(), skip), req_haddock
-      ,stats_num_field('bytes allocated',
-           [(wordsize(64), 27520214496, 5)
-diff -ur a/ghc-8.6.5/testsuite/tests/perf/should_run/all.T 
b/ghc-8.6.5/testsuite/tests/perf/should_run/all.T
---- a/ghc-8.6.5/testsuite/tests/perf/should_run/all.T  2019-07-25 
10:33:31.032000000 +0200
-+++ b/ghc-8.6.5/testsuite/tests/perf/should_run/all.T  2019-07-25 
10:43:01.892000000 +0200
-@@ -32,7 +32,8 @@
-      ['-O'])
- 
- test('T14955',
--     [stats_num_field('bytes allocated',
-+     [skip,
-+      stats_num_field('bytes allocated',
-           [(wordsize(64), 48050760, 5),
-            (wordsize(32), 351508, 5)]),
-       only_ways(['normal'])
-@@ -380,7 +381,8 @@
-      ['-O'])
- 
- test('T7954',
--      [stats_num_field('bytes allocated',
-+      [skip,
-+       stats_num_field('bytes allocated',
-                       [(wordsize(32), 920045264, 10),
-               # some date:  1380051408    (64-bit Windows machine)
-               # 2014-04-04:  920045264    (64-bit Windows machine)
-@@ -459,7 +461,8 @@
-      ['-O2'])
- 
- test('T9203',
--     [stats_num_field('bytes allocated',
-+     [skip,
-+      stats_num_field('bytes allocated',
-                       [ (wordsize(32), 77969268, 5)
-                       # was
-                       # 2016-04-06     84345136 (i386/Debian) not sure