[commit: ghc] master: Revert "testsuite: Fix broken_without_gmp" (a0b9d42)

[git at git.haskell.org]

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

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

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

commit a0b9d42be3ae65860d5187918891344a611ca2ac
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Dec 23 13:45:24 2018 -0500

    Revert "testsuite: Fix broken_without_gmp"
    
    This reverts commit e59439af3222d151918ad1ad2a03942ce9e6a1ff.
    
    This is causing unexpected failures in some test ways. Further proof
    that no change is too trivial for CI.


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

a0b9d42be3ae65860d5187918891344a611ca2ac
 testsuite/driver/testlib.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index f26f9e0..1c6668d 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -213,6 +213,11 @@ def record_broken(name, opts, bug):
     if not me in brokens:
         brokens.append(me)
 
+def broken_without_gmp(name, opts):
+    # Many tests sadly break with integer-simple due to GHCi's ignorance of it.
+    when(config.integer_backend != "integer-gmp",
+         expect_broken(16043))
+
 def _expect_pass(way):
     # Helper function. Not intended for use in .T files.
     opts = getTestOpts()
@@ -460,10 +465,6 @@ def have_gdb( ):
 def have_readelf( ):
     return config.have_readelf
 
-# Many tests sadly break with integer-simple due to GHCi's ignorance of it.
-broken_without_gmp = when(config.integer_backend != "integer-gmp",
-                          expect_broken(16043))
-
 # ---
 
 def high_memory_usage(name, opts):