Commit 73e251da authored by Ian Lynagh's avatar Ian Lynagh
Browse files

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.
parent 7dc2f44e
...@@ -1625,7 +1625,7 @@ def check_stderr_ok( name ): ...@@ -1625,7 +1625,7 @@ def check_stderr_ok( name ):
return normalise_errmsg(str) return normalise_errmsg(str)
return compare_outputs('stderr', \ return compare_outputs('stderr', \
two_normalisers(norm, getTestOpts().extra_normaliser), \ two_normalisers(norm, getTestOpts().extra_errmsg_normaliser), \
expected_stderr_file, actual_stderr_file) expected_stderr_file, actual_stderr_file)
def dump_stderr( name ): def dump_stderr( name ):
......
...@@ -20,7 +20,10 @@ if default_testopts.cleanup != '': ...@@ -20,7 +20,10 @@ if default_testopts.cleanup != '':
else: else:
cleanup = '' cleanup = ''
def ignoreLdOutput(str):
return re.sub('Creating library file: dist.build.libHStest-1.0-ghc[0-9.]*.dll.a\n', '', str)
test('cabal01', test('cabal01',
normal, normalise_errmsg_fun(ignoreLdOutput),
run_command, run_command,
['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup]) ['$MAKE -s --no-print-directory cabal01 VANILLA=' + vanilla + ' PROF=' + prof + ' DYN=' + dyn + ' ' + cleanup])
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment