[8018] info test time out

[gavinsmith0123]

Revision: 8018
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8018
Author:   gavin
Date:     2018-08-07 11:58:43 -0400 (Tue, 07 Aug 2018)
Log Message:
-----------
info test time out

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/t/Init-test.inc

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-07 15:55:18 UTC (rev 8017)
+++ trunk/ChangeLog     2018-08-07 15:58:43 UTC (rev 8018)
@@ -1,5 +1,11 @@
 2018-08-07  Gavin Smith  <address@hidden>
 
+       * info/t/Init-test.inc (run_ginfo, timeout_test): Record process 
+       ID of background process that does the timing out, and kill this 
+       process if ginfo exited first.
+
+2018-08-07  Gavin Smith  <address@hidden>
+
        * info/infomap.c (default_emacs_like_ea_keys)
        (default_vi_like_ea_keys): Remove ineffectual key bindings.
        Remove key bindings for sequences beginning with ESC, as these 

Modified: trunk/info/t/Init-test.inc
===================================================================
--- trunk/info/t/Init-test.inc  2018-08-07 15:55:18 UTC (rev 8017)
+++ trunk/info/t/Init-test.inc  2018-08-07 15:58:43 UTC (rev 8018)
@@ -93,6 +93,10 @@
 {
   wait $GINFO_PID
   status=$?
+
+  # If the program was not ended by a signal, kill the subshell that 
+  # is waiting to send it a signal.
+  test $status -lt 128 && kill $KILLER_PID
   
   RETVAL=0
   if test $status != 0; then
@@ -196,4 +200,5 @@
 
   GINFO_PID=$!
   (sleep 3 ; kill $GINFO_PID) &
+  KILLER_PID=$!
 }