[commit: ghc] wip/fix-integer-simple-ci: Fix normaliser (cbf4aca)

git at git.haskell.org git at git.haskell.org
Thu Dec 27 17:00:48 UTC 2018


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

On branch  : wip/fix-integer-simple-ci
Link       : http://ghc.haskell.org/trac/ghc/changeset/cbf4aca3996964eaeeb3822cf39f562fbec1b6a0/ghc

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

commit cbf4aca3996964eaeeb3822cf39f562fbec1b6a0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 24 11:29:02 2018 -0500

    Fix normaliser


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

cbf4aca3996964eaeeb3822cf39f562fbec1b6a0
 testsuite/driver/testlib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index e0d4e33..5f84863 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1747,7 +1747,7 @@ def normalise_errmsg( str ):
     # Error messages sometimes contain this blurb which can vary
     # spuriously depending upon build configuration (e.g. based on integer
     # backend)
-    str = re.sub('...plus [a-z]+ instances involving out-of-scope types',
+    str = re.sub('...plus ([a-z]+|[0-9]+) instances involving out-of-scope types',
                  '...plus N instances involving out-of-scope types', str)
 
     # Also filter out bullet characters.  This is because bullets are used to



More information about the ghc-commits mailing list