[commit: ghc] master: Fix rts/T9579 tests on OS X (ce2416b)

git at git.haskell.org git at git.haskell.org
Thu Oct 29 04:45:26 UTC 2015


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

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

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

commit ce2416bcceb574cf87140f3e82cc482909f81cc4
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Thu Oct 29 11:25:42 2015 +1100

    Fix rts/T9579 tests on OS X
    
    Sed on OS X does not understand 's/[0-9]\+ bytes/NUM bytes/g' but
    sed on Linux and OS X do understand 's/[0-9]* bytes/NUM bytes/g'.
    
    Test Plan: Run all rts/T9579 tests on Linux and Mac
    
    Reviewers: thomie, austin, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1394


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

ce2416bcceb574cf87140f3e82cc482909f81cc4
 testsuite/tests/rts/T9579/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/rts/T9579/all.T b/testsuite/tests/rts/T9579/all.T
index fd5a3b6..a8522bf 100644
--- a/testsuite/tests/rts/T9579/all.T
+++ b/testsuite/tests/rts/T9579/all.T
@@ -11,7 +11,7 @@ def T9579_run_test(binName, expExitCode):
     testCommandTemplate = """
           $MAKE -s --no-print-directory T9579_{binName} \
         && ( ( ./T9579_{binName} 2>&1; echo $?) \
-           | sed -e 's/[0-9]\+ bytes/NUM bytes/g' ) \
+           | sed -e 's/[0-9]* bytes/NUM bytes/g' ) \
     """
 
     test(fmt('T9579_{binName}'),



More information about the ghc-commits mailing list