[commit: ghc] master: Testsuite: only print msg when timeout kills process unexpectedly (e1293bb)

[git at git.haskell.org]

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

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

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

commit e1293bbfb1fa1fdeb56446a7b957d6f628042e71
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Sep 3 16:13:42 2015 +0200

    Testsuite: only print msg when timeout kills process unexpectedly
    
    Differential Revision: https://phabricator.haskell.org/D1207


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

e1293bbfb1fa1fdeb56446a7b957d6f628042e71
 testsuite/driver/testlib.py  | 4 ++++
 testsuite/timeout/timeout.py | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 5a587a7..ee6f631 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1798,6 +1798,10 @@ def rawSystemWithTimeout(cmd_and_args):
     if r == 98:
         # The python timeout program uses 98 to signal that ^C was pressed
         stopNow()
+    if r == 99 and getTestOpts().exit_code != 99:
+        # Only print a message when timeout killed the process unexpectedly.
+        cmd = cmd_and_args[-1]
+        if_verbose(1, 'Timeout happened...killed process "{}"...\n'.format(cmd))
     return r
 
 # cmd is a complex command in Bourne-shell syntax
diff --git a/testsuite/timeout/timeout.py b/testsuite/timeout/timeout.py
index 1016e2d..51fb63c 100644
--- a/testsuite/timeout/timeout.py
+++ b/testsuite/timeout/timeout.py
@@ -35,8 +35,6 @@ try:
     else:
         # parent
         def handler(signum, frame):
-            msg = 'Timeout happened...killing process %s...\n' % cmd
-            sys.stderr.write(msg)
             killProcess(pid)
             sys.exit(99)
         old = signal.signal(signal.SIGALRM, handler)