[commit: ghc] master: array: Clear up inconsistency in T9220 output (60307cb)

[git at git.haskell.org]

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

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

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

commit 60307cb85abc8d53845598a430c0ee9264fb2d82
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Apr 2 13:04:26 2017 -0400

    array: Clear up inconsistency in T9220 output
    
    ghc-8.2 and master disagreed on the order of the instances. Normalise this
    difference away.
    
    Updates array submodule.


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

60307cb85abc8d53845598a430c0ee9264fb2d82
 libraries/array             | 2 +-
 testsuite/driver/testlib.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libraries/array b/libraries/array
index fc82074..db07d53 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit fc82074a9076d650610d71a966d8714f5217257f
+Subproject commit db07d534feb267d5f81e1301f6a0cb726c4c2ea2
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 7dedb33..a5da1e9 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -493,6 +493,13 @@ def no_check_hp(name, opts):
 
 # ----
 
+def filter_stdout_lines( regex ):
+    """ Filter lines of stdout with the given regular expression """
+    import re
+    def f( name, opts ):
+        _normalise_fun(name, opts, lambda s: '\n'.join(re.findall(regex, s)))
+    return f
+
 def normalise_slashes( name, opts ):
     _normalise_fun(name, opts, normalise_slashes_)