[commit: testsuite] master: Fix cabal01 on Windows (cb2592b)

[Ian Lynagh]

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

On branch  : master

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

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

commit cb2592b63423d170ef6dadadf55ddf2baa486e1c
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Feb 5 19:53:20 2013 +0000

    Fix cabal01 on Windows
    
    We were getting a
        Creating library file: dist\build\libHStest-1.0-ghc7.7.20130205.dll.a
    message on stderr. We can't turn it off, so now the test just normalises
    it away.

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

 driver/testlib.py         |    2 +-
 tests/cabal/cabal01/all.T |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/driver/testlib.py b/driver/testlib.py
index 54bae83..476495d 100644
--- a/driver/testlib.py
+++ b/driver/testlib.py
@@ -1625,7 +1625,7 @@ def check_stderr_ok( name ):
          return normalise_errmsg(str)
 
    return compare_outputs('stderr', \
-                          two_normalisers(norm, getTestOpts().extra_normaliser), \
+                          two_normalisers(norm, getTestOpts().extra_errmsg_normaliser), \
                           expected_stderr_file, actual_stderr_file)
 
 def dump_stderr( name ):
diff --git a/tests/cabal/cabal01/all.T b/tests/cabal/cabal01/all.T
index 2c64449..f887323 100644
--- a/tests/cabal/cabal01/all.T
+++ b/tests/cabal/cabal01/all.T
@@ -20,7 +20,10 @@ if default_testopts.cleanup != '':
 else:
    cleanup = ''
 
+def ignoreLdOutput(str):
+    return re.sub('Creating library file: dist.build.libHStest-1.0-ghc[0-9.]*.dll.a\n', '', str)
+
 test('cabal01',
-     normal,
+     normalise_errmsg_fun(ignoreLdOutput),
      run_command, 
      ['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])