[commit: ghc] master: fix topHandler03 execution on Solaris where shell signals SIGTERM correctly (1f24a03)

git at git.haskell.org git at git.haskell.org
Mon Aug 4 13:16:21 UTC 2014


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

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

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

commit 1f24a03234a6b0bb0e38a47a471ef3004ce858d0
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Mon Aug 4 08:15:54 2014 -0500

    fix topHandler03 execution on Solaris where shell signals SIGTERM correctly
    
    Summary:
    This patch fixes topHandler03 execution on Solaris where
    shell correctly signals SIGTERM as exit status 15.
    
    Test Plan: validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: phaskell, simonmar, relrod, ezyang, carter
    
    Differential Revision: https://phabricator.haskell.org/D112


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

1f24a03234a6b0bb0e38a47a471ef3004ce858d0
 libraries/base/tests/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 12a2410..c85d7bc 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -152,7 +152,8 @@ test('topHandler03',
      [when(opsys('mingw32'), skip),
       # As above, shells, grrr.
       ignore_output,
-      exit_code(143)  # actually signal 15 SIGTERM
+      when(opsys('solaris2'), exit_code(15)), # Solaris signals 15 correctly
+      when(not opsys('solaris2'), exit_code(143)) # actually signal 15 SIGTERM
      ], compile_and_run, [''])
 
 



More information about the ghc-commits mailing list