Add n-ary version of `two_normalisers` to testsuite lib

This is more readable than nesting `two_normalisers()`-invocations

1 files changed, 8 insertions, 4 deletions

diff --git a/testsuite/tests/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T
index 8b33f27297..5b2839d9c1 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/all.T
+++ b/testsuite/tests/safeHaskell/check/pkg01/all.T
@@ -8,6 +8,9 @@ def normaliseArrayPackage(str):
 def normaliseBytestringPackage(str):
     return re.sub('bytestring-[0-9]+(\.[0-9]+)*', 'bytestring-<VERSION>', str)
 
+def normaliseIntegerPackage(str):
+    return re.sub('integer-(gmp|simple)-[0-9.]+', 'integer-<IMPL>-<VERSION>', str)
+
 def normaliseArrayPackageKey(str):
     return re.sub('array_[A-Za-z0-9]+', 'array_<HASH>', str)
 
@@ -38,10 +41,11 @@ make_args = 'VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn
 test('safePkg01',
      [clean_cmd('$MAKE -s --no-print-directory cleanPackageDatabase.safePkg01'),
       normalise_errmsg_fun(ignoreLdOutput),
-      normalise_fun(two_normalisers(two_normalisers(normaliseArrayPackage,
-                                                    normaliseArrayPackageKey),
-                                    normaliseBytestringPackage))],
-     run_command, 
+      normalise_fun(join_normalisers(
+        normaliseArrayPackage,
+        normaliseArrayPackageKey,
+        normaliseBytestringPackage))],
+     run_command,
      ['$MAKE -s --no-print-directory safePkg01 ' + make_args])
 
 # Fail since we enable package trust