Commit 06d0dda1 authored by Simon Marlow's avatar Simon Marlow
Browse files

Fix spurious failure in ghcpkg05 in the nightly build

parent 1053d725
......@@ -1339,15 +1339,15 @@ def compare_outputs( kind, normaliser, extra_normaliser,
expected_file, actual_file ):
if os.path.exists(expected_file):
expected_raw = read_no_crs(expected_file)
expected_str = normaliser(expected_raw)
expected_str = extra_normaliser(normaliser(expected_raw))
else:
expected_str = ''
expected_file = ''
actual_raw = read_no_crs(actual_file)
actual_str = normaliser(actual_raw)
actual_str = extra_normaliser(normaliser(actual_raw))
if extra_normaliser(expected_str) != extra_normaliser(actual_str):
if expected_str != actual_str:
print 'Actual ' + kind + ' output differs from expected:'
if expected_file == '':
......
......@@ -21,11 +21,19 @@ test('ghcpkg04',
'local04.package.conf.old'])],
run_command,
['$MAKE -s --no-print-directory ghcpkg04'])
# Sometimes we get spurious warnings from ghc-pkg about missing
# haddock-interfaces; this filters them out.
def normalise_haddock_junk( str ):
return re.sub(r'Warning: haddock.*\n', '', str)
test('ghcpkg05',
extra_clean(['local05a.package.conf',
'local05a.package.conf.old',
'local05b.package.conf',
'local05b.package.conf.old']),
[ extra_clean(['local05a.package.conf',
'local05a.package.conf.old',
'local05b.package.conf',
'local05b.package.conf.old']),
normalise_fun(normalise_haddock_junk)
],
run_command,
['$MAKE -s --no-print-directory ghcpkg05'])
test('ghcpkg06',
......
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