diff options
| -rw-r--r-- | testsuite/driver/testlib.py | 6 | ||||
| -rw-r--r-- | testsuite/tests/ghc-regress/cabal/all.T | 16 |
2 files changed, 15 insertions, 7 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index f48b86df81..6cd6c3340e 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -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 == '': diff --git a/testsuite/tests/ghc-regress/cabal/all.T b/testsuite/tests/ghc-regress/cabal/all.T index ed8b9e28b7..2ec0fa8ff7 100644 --- a/testsuite/tests/ghc-regress/cabal/all.T +++ b/testsuite/tests/ghc-regress/cabal/all.T @@ -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', |