[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7864] remove file Timeout-test.inc
|
From: |
gavinsmith0123 |
|
Subject: |
[7864] remove file Timeout-test.inc |
|
Date: |
Mon, 26 Jun 2017 16:37:44 -0400 (EDT) |
Revision: 7864
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7864
Author: gavin
Date: 2017-06-26 16:37:43 -0400 (Mon, 26 Jun 2017)
Log Message:
-----------
remove file Timeout-test.inc
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/t/Init-test.inc
trunk/info/t/adjust-anchors.sh
trunk/info/t/all-only.sh
trunk/info/t/anchor-positions.sh
trunk/info/t/body-start.sh
trunk/info/t/c-u-m-x-scroll-forward.sh
trunk/info/t/close-window-after-search.sh
trunk/info/t/dir-entry-to-subdir.sh
trunk/info/t/dir-merge.sh
trunk/info/t/empty-infopath.sh
trunk/info/t/end-of-line.sh
trunk/info/t/gc-split.sh
trunk/info/t/goal-column.sh
trunk/info/t/goto-quoted.sh
trunk/info/t/inc-sea-forward-nonregex.sh
trunk/info/t/inc-sea-forward.sh
trunk/info/t/inc-sea-history.sh
trunk/info/t/inc-sea-insensitive.sh
trunk/info/t/index-apropos.sh
trunk/info/t/index-completing.sh
trunk/info/t/index-long-nodeline.sh
trunk/info/t/index-search.sh
trunk/info/t/index.sh
trunk/info/t/last-no-history.sh
trunk/info/t/last-node-not-top-level.sh
trunk/info/t/menu-sequence.sh
trunk/info/t/next-quoted.sh
trunk/info/t/no-index.sh
trunk/info/t/quoted-label-and-target.sh
trunk/info/t/quoted-label-as-target.sh
trunk/info/t/quoted-manual-in-label.sh
trunk/info/t/quoted-manual-in-target.sh
trunk/info/t/quoted-target.sh
trunk/info/t/relative-reference.sh
trunk/info/t/replace-viewed.sh
trunk/info/t/resize-in-completions.sh
trunk/info/t/search-after-tag.sh
trunk/info/t/search-empty.sh
trunk/info/t/search-skip-screen.sh
trunk/info/t/search-split-after-index.sh
trunk/info/t/split-file-menu.sh
trunk/info/t/split-footnotes.sh
trunk/info/t/split-index.sh
trunk/info/t/star-note-non-whitespace.sh
trunk/info/t/tab-argument.sh
trunk/info/t/tab-no-xref.sh
trunk/info/t/tab-skip-node.sh
trunk/info/t/tab.sh
trunk/info/t/window-split-dir.sh
trunk/info/t/xref-across-lines.sh
trunk/info/t/xref-to-anchor.sh
Removed Paths:
-------------
trunk/info/t/Timeout-test.inc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/ChangeLog 2017-06-26 20:37:43 UTC (rev 7864)
@@ -1,5 +1,11 @@
2017-06-26 Gavin Smith <address@hidden>
+ * info/t/Timeout-test.inc,
+ * info/t/Init-test.inc (timeout-test): Move code to timeout the
+ test to a shell function.
+
+2017-06-26 Gavin Smith <address@hidden>
+
* info/t/Init-inter.inc (run_ginfo): Time out test by running a
subshell in the background that kills the current shell inside
an "sh -c" command, and execing the ginfo program. Do not use a
Modified: trunk/info/t/Init-test.inc
===================================================================
--- trunk/info/t/Init-test.inc 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/Init-test.inc 2017-06-26 20:37:43 UTC (rev 7864)
@@ -89,3 +89,17 @@
#cleanup
+timeout_test ()
+{
+ wait $GINFO_PID
+ status=$?
+
+ RETVAL=0
+ if test $status != 0; then
+ RETVAL=1
+ fi
+
+ # Program is gone, so avoid trying to kill it in cleanup
+ GINFO_PID=0
+}
+
Deleted: trunk/info/t/Timeout-test.inc
===================================================================
--- trunk/info/t/Timeout-test.inc 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/Timeout-test.inc 2017-06-26 20:37:43 UTC (rev 7864)
@@ -1,28 +0,0 @@
-# Copyright (C) 2014, 2015 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# Shell script snippet. Wait for program to finish.
-
-wait $GINFO_PID
-status=$?
-
-RETVAL=0
-if test $status != 0; then
- RETVAL=1
-fi
-
-# Program is gone, so avoid trying to kill it in cleanup
-GINFO_PID=0
-
Modified: trunk/info/t/adjust-anchors.sh
===================================================================
--- trunk/info/t/adjust-anchors.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/adjust-anchors.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -30,7 +30,7 @@
printf 'ganchor-2\r\002\002\002\002\002\002' >$PTY_TYPE
printf '\002\002\002\002\002\002\002\002\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/all-only.sh
===================================================================
--- trunk/info/t/all-only.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/all-only.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -26,7 +26,7 @@
# on there being no "intera" entry in "dir".
run_ginfo --all intera
printf 'Dq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
grep '^File: intera.info, Node: Top' $GINFO_OUTPUT
RETVAL=$?
Modified: trunk/info/t/anchor-positions.sh
===================================================================
--- trunk/info/t/anchor-positions.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/anchor-positions.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -24,6 +24,6 @@
run_ginfo -f anchor-positions
printf q >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/body-start.sh
===================================================================
--- trunk/info/t/body-start.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/body-start.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Check that node headers aren't included in searches
printf 'sPotential match\r\rDq' >$PTY_TYPE &
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/c-u-m-x-scroll-forward.sh
===================================================================
--- trunk/info/t/c-u-m-x-scroll-forward.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/c-u-m-x-scroll-forward.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -34,7 +34,7 @@
printf '\025\033xscroll-forward\r' >$PTY_TYPE
printf '\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Return non-zero (test failure) if files differ
diff $GINFO_OUTPUT $t/node-target
Modified: trunk/info/t/close-window-after-search.sh
===================================================================
--- trunk/info/t/close-window-after-search.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/close-window-after-search.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -24,6 +24,6 @@
# place in.
printf '\0302sblah\r\0300q' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/dir-entry-to-subdir.sh
===================================================================
--- trunk/info/t/dir-entry-to-subdir.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/dir-entry-to-subdir.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
# Follow a dir entry to a file in a subdirectory of infodir
run_ginfo subdir
printf 'Dq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cat $GINFO_OUTPUT
grep '^File: file-in-subdir.info' $GINFO_OUTPUT
Modified: trunk/info/t/dir-merge.sh
===================================================================
--- trunk/info/t/dir-merge.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/dir-merge.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -24,6 +24,6 @@
run_ginfo -v hide-note-references=On file-in-subdir
printf q >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/empty-infopath.sh
===================================================================
--- trunk/info/t/empty-infopath.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/empty-infopath.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -25,7 +25,7 @@
export INFOPATH
run_ginfo
printf q >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/end-of-line.sh
===================================================================
--- trunk/info/t/end-of-line.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/end-of-line.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Check that typing C-e on an empty line doesn't go to previous line
printf '\x0e\x0e\x0e\x0e\x0e\x05\x0e\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/gc-split.sh
===================================================================
--- trunk/info/t/gc-split.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/gc-split.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -23,7 +23,7 @@
# incremental search. Refresh the screen afterwards to increase the
# chances of trying to access freed file contents.
printf '\023aa\033[B\014q' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/goal-column.sh
===================================================================
--- trunk/info/t/goal-column.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/goal-column.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -23,7 +23,7 @@
printf '/^Goal column test\r\016' >$PTY_TYPE
printf '\005\016\016\006\006' >$PTY_TYPE
printf '\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
diff $GINFO_OUTPUT $t/node-target
RETVAL=$?
Modified: trunk/info/t/goto-quoted.sh
===================================================================
--- trunk/info/t/goto-quoted.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/goto-quoted.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Go to a node with colons and commas in its name with "g"
printf 'g\tColo\t\r\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/inc-sea-forward-nonregex.sh
===================================================================
--- trunk/info/t/inc-sea-forward-nonregex.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/inc-sea-forward-nonregex.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -27,7 +27,7 @@
printf 'R\023matchxy\010\010' >$PTY_TYPE
printf '\023\023\023\r\006\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Return non-zero (test failure) if files differ
diff $GINFO_OUTPUT $t/node-target
Modified: trunk/info/t/inc-sea-forward.sh
===================================================================
--- trunk/info/t/inc-sea-forward.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/inc-sea-forward.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -27,7 +27,7 @@
printf '\023matchxy\010\010' >$PTY_TYPE
printf '\023\023\023\r\006\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Return non-zero (test failure) if files differ
diff $GINFO_OUTPUT $t/node-target
Modified: trunk/info/t/inc-sea-history.sh
===================================================================
--- trunk/info/t/inc-sea-history.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/inc-sea-history.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -30,7 +30,7 @@
RETVAL=$?
printf 'lDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test $RETVAL = 0; then
grep 'Node: Top' $GINFO_OUTPUT
Modified: trunk/info/t/inc-sea-insensitive.sh
===================================================================
--- trunk/info/t/inc-sea-insensitive.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/inc-sea-insensitive.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -26,7 +26,7 @@
printf '\023matchX\010' >$PTY_TYPE
printf '\023\023\r\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Return non-zero (test failure) if files differ
diff $GINFO_OUTPUT $t/node-target
Modified: trunk/info/t/index-apropos.sh
===================================================================
--- trunk/info/t/index-apropos.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/index-apropos.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -28,7 +28,7 @@
# We exited the "i" prompt with "xxx\r" instead of "\007" because
# C-g leads typeahead to be discarded so it would not be reliable.
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/index-completing.sh
===================================================================
--- trunk/info/t/index-completing.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/index-completing.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f index-search
# Check that pressing tab to complete works for index search
printf 'i\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
grep '^Node: Node 2' $GINFO_OUTPUT
RETVAL=$?
Modified: trunk/info/t/index-long-nodeline.sh
===================================================================
--- trunk/info/t/index-long-nodeline.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/index-long-nodeline.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Follow an menu item from the index node to a node where physical lines
# don't match logical lines.
printf 'gIndex\r\t\t\r\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/index-search.sh
===================================================================
--- trunk/info/t/index-search.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/index-search.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -23,7 +23,7 @@
# entry and select it.
printf 'Ibc\r\016\016\016\016\016\016\016\016\016\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Return non-zero (test failure) if files differ
diff $GINFO_OUTPUT $t/node-target
Modified: trunk/info/t/index.sh
===================================================================
--- trunk/info/t/index.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/index.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Follow an index entry
printf 'iabc\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/last-no-history.sh
===================================================================
--- trunk/info/t/last-no-history.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/last-no-history.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Try to go back in history when there is no earlier node
printf lq >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/last-node-not-top-level.sh
===================================================================
--- trunk/info/t/last-node-not-top-level.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/last-node-not-top-level.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -22,7 +22,7 @@
# Wrap round to top node when last node does not have Top as Up
printf ']]]Dq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
grep 'Node: Top' $GINFO_OUTPUT
RETVAL=$?
Modified: trunk/info/t/menu-sequence.sh
===================================================================
--- trunk/info/t/menu-sequence.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/menu-sequence.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f intera
# M-x menu-sequence
printf '\033xmenu-sequence\rfile-menu,first,no,nod\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/next-quoted.sh
===================================================================
--- trunk/info/t/next-quoted.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/next-quoted.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f quoting
# Go to a node with colons and commas in its name with "n"
printf 'n\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/no-index.sh
===================================================================
--- trunk/info/t/no-index.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/no-index.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f sample
# Try to search in the indices when there aren't any
printf 'ia\rq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/quoted-label-and-target.sh
===================================================================
--- trunk/info/t/quoted-label-and-target.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/quoted-label-and-target.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -22,7 +22,7 @@
# Follow a cross-reference with both the label and destination quoted.
printf '\t\t\t\r\t\rDq' >$PTY_TYPE &
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/quoted-label-as-target.sh
===================================================================
--- trunk/info/t/quoted-label-as-target.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/quoted-label-as-target.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -21,7 +21,7 @@
run_ginfo -f quoting
# Follow a cross-reference to a node with colons and commas in its name
printf '\t\r\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/quoted-manual-in-label.sh
===================================================================
--- trunk/info/t/quoted-manual-in-label.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/quoted-manual-in-label.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -21,7 +21,7 @@
run_ginfo -f quoting
# Follow a cross-reference with a manual and quoted nodename in the label.
printf '\t\t\t\t\t\r\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/quoted-manual-in-target.sh
===================================================================
--- trunk/info/t/quoted-manual-in-target.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/quoted-manual-in-target.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -22,7 +22,7 @@
# Follow a cross-reference with a manual and quoted nodename in the target,
# after the colon.
printf '\t\t\t\t\r\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/quoted-target.sh
===================================================================
--- trunk/info/t/quoted-target.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/quoted-target.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f quoting
# Follow a cross-reference to a node with colons and commas in its name
printf '\t\t\r\t\r\Dq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/relative-reference.sh
===================================================================
--- trunk/info/t/relative-reference.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/relative-reference.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -25,6 +25,6 @@
printf '\0302\t\t\t\r' >$PTY_TYPE
printf '\030o\0301\t\t\t\rq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/replace-viewed.sh
===================================================================
--- trunk/info/t/replace-viewed.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/replace-viewed.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -45,6 +45,6 @@
printf q >$PTY_TYPE
rm -f t/replace-viewed.info
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/resize-in-completions.sh
===================================================================
--- trunk/info/t/resize-in-completions.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/resize-in-completions.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -34,6 +34,6 @@
printf '\007q' >$PTY_TYPE
fi
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/search-after-tag.sh
===================================================================
--- trunk/info/t/search-after-tag.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/search-after-tag.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
# Search for text in a node that appears after an Info tag
printf '/match\r\x06\x06\x06\x06\x06\x06\x06\x06\x06\x06\x06\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/search-empty.sh
===================================================================
--- trunk/info/t/search-empty.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/search-empty.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,6 +22,6 @@
# Search without specifying a search string, and check we don't crash.
printf 's\rq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/search-skip-screen.sh
===================================================================
--- trunk/info/t/search-skip-screen.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/search-skip-screen.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -23,7 +23,7 @@
# Go back to previous match when search-skip-screen=On
printf 'smatch\r}{Dq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Check we went back to the right node.
grep '^File: search\.info, Node: Top' $GINFO_OUTPUT
Modified: trunk/info/t/search-split-after-index.sh
===================================================================
--- trunk/info/t/search-split-after-index.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/search-split-after-index.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -23,7 +23,7 @@
run_ginfo -f split 'Link to node'
printf '/node\r}}}}}q' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/split-file-menu.sh
===================================================================
--- trunk/info/t/split-file-menu.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/split-file-menu.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -24,7 +24,7 @@
# the one containing "Top". Check that we arrived properly and remembered
# that we are in a split file by going back to "Top" with "t".
printf tDq >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/split-footnotes.sh
===================================================================
--- trunk/info/t/split-footnotes.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/split-footnotes.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f intera -n 'Node with footnotes' -v automatic-footnotes=On
# Move to automatic footnotes window and split it. Check we don't crash.
printf '\030o\0302qqqq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/split-index.sh
===================================================================
--- trunk/info/t/split-index.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/split-index.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
run_ginfo -f split
printf 'ientry text\r\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/star-note-non-whitespace.sh
===================================================================
--- trunk/info/t/star-note-non-whitespace.sh 2017-06-26 20:24:28 UTC (rev
7863)
+++ trunk/info/t/star-note-non-whitespace.sh 2017-06-26 20:37:43 UTC (rev
7864)
@@ -24,7 +24,7 @@
# it is followed by a non-whitespace character.
printf '\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
# Return non-zero (test failure) if files differ
diff $GINFO_OUTPUT $t/node-target
Modified: trunk/info/t/tab-argument.sh
===================================================================
--- trunk/info/t/tab-argument.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/tab-argument.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f intera -n 'Argument to tab'
# C-u 2 TAB to go to second link
printf '\0252\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
diff $GINFO_OUTPUT $t/node-target
RETVAL=$?
Modified: trunk/info/t/tab-no-xref.sh
===================================================================
--- trunk/info/t/tab-no-xref.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/tab-no-xref.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,6 +22,6 @@
# Check that pressing tab in a file with no cross-references or menus
# doesn't cause an infinite loop
printf '\tq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
cleanup
Modified: trunk/info/t/tab-skip-node.sh
===================================================================
--- trunk/info/t/tab-skip-node.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/tab-skip-node.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -24,7 +24,7 @@
# back to the last node that was actually displayed, and not to the
# skipped node.
printf '\t\t\tlDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
grep 'Node: Top' $GINFO_OUTPUT
RETVAL=$?
Modified: trunk/info/t/tab.sh
===================================================================
--- trunk/info/t/tab.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/tab.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -21,7 +21,7 @@
run_ginfo -f intera
# Tab to first link and follow it
printf '\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
Modified: trunk/info/t/window-split-dir.sh
===================================================================
--- trunk/info/t/window-split-dir.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/window-split-dir.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -22,7 +22,7 @@
run_ginfo
# Split it in two, go to the new window, and make it the only window.
printf '\0302\030o\0301Dq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
grep '^File: dir' $GINFO_OUTPUT
RETVAL=$?
Modified: trunk/info/t/xref-across-lines.sh
===================================================================
--- trunk/info/t/xref-across-lines.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/xref-across-lines.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -20,7 +20,7 @@
run_ginfo -f intera -n 'Xref target crosses lines'
printf '\t\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
diff $GINFO_OUTPUT $t/node-target
RETVAL=$?
Modified: trunk/info/t/xref-to-anchor.sh
===================================================================
--- trunk/info/t/xref-to-anchor.sh 2017-06-26 20:24:28 UTC (rev 7863)
+++ trunk/info/t/xref-to-anchor.sh 2017-06-26 20:37:43 UTC (rev 7864)
@@ -25,7 +25,7 @@
# Follow the cross-reference on the line after the anchor
printf '\6\6\rDq' >$PTY_TYPE
-. $t/Timeout-test.inc
+timeout_test
if test ! -f $GINFO_OUTPUT; then
RETVAL=1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7864] remove file Timeout-test.inc,
gavinsmith0123 <=