[commit: testsuite] master: Use normalise_errmsg_fun rather than normalise_fun where appropriate (fbe4e33)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fbe4e33539a8f13b3b4019971f5963fc70c66a6f

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

commit fbe4e33539a8f13b3b4019971f5963fc70c66a6f
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Feb 5 20:17:58 2013 +0000

    Use normalise_errmsg_fun rather than normalise_fun where appropriate

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

 tests/cabal/all.T            |    6 +++---
 tests/safeHaskell/ghci/all.T |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/cabal/all.T b/tests/cabal/all.T
index 04e918d..d05d05f 100644
--- a/tests/cabal/all.T
+++ b/tests/cabal/all.T
@@ -16,7 +16,7 @@ test('ghcpkg02',
 test('ghcpkg03',
      [extra_clean(['local03.package.conf',
                    'local03.package.conf.old']),
-      normalise_fun(normaliseDynlibNames)],
+      normalise_errmsg_fun(normaliseDynlibNames)],
      run_command,
      ['$MAKE -s --no-print-directory ghcpkg03'])
 test('ghcpkg04',
@@ -36,8 +36,8 @@ test('ghcpkg05',
                     'local05a.package.conf.old',
                     'local05b.package.conf',
                     'local05b.package.conf.old']),
-       normalise_fun(two_normalisers(normalise_haddock_junk,
-                                     normaliseDynlibNames))
+       normalise_errmsg_fun(two_normalisers(normalise_haddock_junk,
+                                            normaliseDynlibNames))
        ],
      run_command,
      ['$MAKE -s --no-print-directory ghcpkg05'])
diff --git a/tests/safeHaskell/ghci/all.T b/tests/safeHaskell/ghci/all.T
index 2a91b33..2dca62e 100644
--- a/tests/safeHaskell/ghci/all.T
+++ b/tests/safeHaskell/ghci/all.T
@@ -5,7 +5,7 @@ def normaliseBytestringPackage(str):
 
 test('p1', normal, ghci_script, ['p1.script'])
 test('p2', normal, ghci_script, ['p2.script'])
-test('p3', normalise_fun(normaliseBytestringPackage),
+test('p3', normalise_errmsg_fun(normaliseBytestringPackage),
            ghci_script, ['p3.script'])
 test('p4', normal, ghci_script, ['p4.script'])
 test('p5', normal, ghci_script, ['p5.script'])
@@ -15,13 +15,13 @@ test('p8', normal, ghci_script, ['p8.script'])
 test('p9', normal, ghci_script, ['p9.script'])
 test('p10', normal, ghci_script, ['p10.script'])
 test('p11', normal, ghci_script, ['p11.script'])
-test('p12', normalise_fun(normaliseBytestringPackage),
+test('p12', normalise_errmsg_fun(normaliseBytestringPackage),
             ghci_script, ['p12.script'])
 test('p13', normal, ghci_script, ['p13.script'])
 test('p14', normal, ghci_script, ['p14.script'])
 test('p15', normal, ghci_script, ['p15.script'])
 test('p16', normal, ghci_script, ['p16.script'])
-test('p17', normalise_fun(normaliseBytestringPackage),
+test('p17', normalise_errmsg_fun(normaliseBytestringPackage),
             ghci_script, ['p17.script'])
 # 7172
 test('p18', normalise_fun(normaliseBytestringPackage),