[commit: ghc] master: Testsuite: fix framework failure (2613271)

git at git.haskell.org git at git.haskell.org
Mon Jun 15 14:23:36 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2613271ff2eee66c285fbfc5aa6ae22af44138fa/ghc

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

commit 2613271ff2eee66c285fbfc5aa6ae22af44138fa
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Jun 15 16:19:42 2015 +0200

    Testsuite: fix framework failure
    
    I forgot to rename this in 5ddd90415f307cac72d75d86da58e552b168ee30.


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

2613271ff2eee66c285fbfc5aa6ae22af44138fa
 testsuite/driver/testlib.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 3da01ce..033440b 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1684,8 +1684,8 @@ def compare_outputs(way, kind, normaliser, expected_file, actual_file,
             # If for some reason there were no non-whitespace differences,
             # then do a full diff
             if r == 0:
-                r = os.system( 'diff -u ' + expected_file_for_diff + \
-                                      ' ' + actual_file )
+                r = os.system( 'diff -u ' + expected_normalised_file + \
+                                      ' ' + actual_normalised_file )
 
         if config.accept and (getTestOpts().expect == 'fail' or
                               way in getTestOpts().expect_fail_for):



More information about the ghc-commits mailing list