[commit: ghc] master: Fixed T5435_dyn_asm on Windows. The test code was not in sync with the expected output. (a47ff8b)

git at git.haskell.org git at git.haskell.org
Sat Nov 1 13:20:33 UTC 2014


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

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

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

commit a47ff8be5aa78aff2eb80d5f91e294f52ea392e0
Author: Gintautas Miliauskas <gintautas.miliauskas at gmail.com>
Date:   Sat Nov 1 08:20:45 2014 -0500

    Fixed T5435_dyn_asm on Windows. The test code was not in sync with the expected output.
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie, carter, simonmar
    
    Differential Revision: https://phabricator.haskell.org/D403
    
    GHC Trac Issues: #5435


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

a47ff8be5aa78aff2eb80d5f91e294f52ea392e0
 testsuite/tests/rts/all.T | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 015a9c7..6d08594 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -142,6 +142,8 @@ def checkDynAsm(actual_file, normaliser):
     elif actual == ['ctors1', 'ctors2', 'initArray1', 'initArray2', 'success']:
         if_verbose(1, 'T5435_dyn_asm detected old-style dlopen, see #8458')
         return 1
+    elif opsys('mingw32') and actual == ['ctors1', 'ctors2', 'success']:
+        return 1
     else:
         if_verbose(1, 'T5435_dyn_asm failed with %s, see all.T for details' % actual)
         return 0



More information about the ghc-commits mailing list