[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8015] remove Init-inter.inc as separate file
|
From: |
gavinsmith0123 |
|
Subject: |
[8015] remove Init-inter.inc as separate file |
|
Date: |
Tue, 7 Aug 2018 10:45:48 -0400 (EDT) |
Revision: 8015
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8015
Author: gavin
Date: 2018-08-07 10:45:48 -0400 (Tue, 07 Aug 2018)
Log Message:
-----------
remove Init-inter.inc as separate file
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/t/Init-test.inc
trunk/info/t/README
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/echo-area-no-completions.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-bs.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/malformed-split.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-2.sh
trunk/info/t/xref-across-lines.sh
trunk/info/t/xref-to-anchor.sh
Removed Paths:
-------------
trunk/info/t/Init-inter.inc
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/ChangeLog 2018-08-07 14:45:48 UTC (rev 8015)
@@ -1,6 +1,16 @@
2018-08-07 Gavin Smith <address@hidden>
- * info/t/Init-test.inc (run_ginfo): Run ginfo inside a subshell
+ * info/t/Init-inter.inc: File removed. All contents moved into
+ Init-test.inc.
+
+2018-08-07 Gavin Smith <address@hidden>
+
+ * info/t/Init-inter.inc (init_interactive_test): New function,
+ containing commands that were at the top-level of this file.
+
+2018-08-07 Gavin Smith <address@hidden>
+
+ * info/t/Init-inter.inc (run_ginfo): Run ginfo inside a subshell
with parentheses instead of using "sh -c". This enables the use
of "$@" and avoids the need for an extra level of quoting when
calling run_ginfo. Time out the process outside of the
Deleted: trunk/info/t/Init-inter.inc
===================================================================
--- trunk/info/t/Init-inter.inc 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/Init-inter.inc 2018-08-07 14:45:48 UTC (rev 8015)
@@ -1,106 +0,0 @@
-# Copyright (C) 2014, 2015, 2016, 2017, 2018 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/>.
-
-# we may look up whether a couple of utilities exist.
-
-path_sep=":"
-
-# findprog PROG - Return true if PROG is somewhere in PATH, else false.
-findprog ()
-{
- saveIFS=$IFS
- IFS=$path_sep # break path components at the path separator
- for dir in $PATH; do
- IFS=$saveIFS
- # The basic test for an executable is `test -f $f && test -x $f'.
- # (`test -x' is not enough, because it can also be true for directories.)
- # We have to try this both for $1 and $1.exe.
- #
- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
- # also `test -f' has this enhancement, but not on DJGPP. (Both are
- # design decisions, so there is little chance to make them consistent.)
- # Thusly, it seems to be difficult to make use of these enhancements.
- #
- if { test -f "$dir/$1" && test -x "$dir/$1"; } \
- || { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
- return 0
- fi
- done
- return 1
-}
-
-# Initialize test of interactive operation
-init_interactive_test ()
-{
- test -v initialization_done && return 0
- initialization_done=1
-
- # Skip test if pseudotty wasn't built
- test -x pseudotty || exit 77
-
- # Avoid ginfo complaining that terminal is too dumb
- TERM=vt100; export TERM
-
- # See 'cleanup' function
- findprog stty && { STTY=stty ; reset_required=yes ; }
- test $reset_required=yes && { $STTY | grep [-]echo ; } && reset_required=no
-
- # Create named pipes to communicate with pseudotty program, or quit.
- rm -f $PIPEIN $PTY_TYPE # must already be defined
- if findprog mkfifo; then
- mkfifo $PIPEIN
- mkfifo $PTY_TYPE
- #
- if test ! -r $PIPEIN || test ! -r $PTY_TYPE; then
- echo "$0: could not mkfifo pipes" >&2
- exit 77
- fi
- # ok, we'll proceed with the test.
- else
- echo "$0: mkfifo program not found - cannot make named pipes" >&2
- exit 77
- fi
-
- # We can feed input bytes into $PTY_TYPE to be passed onto ginfo, as
- # if they were typed by a user in an interactive session.
- # We redirect to the FIFO within a subshell, because under NetBSD 6.1.4
- # it hangs otherwise.
- (exec ./pseudotty "$PTY_TYPE" >$PIPEIN) &
- PTY_PID=$!
- # Get name of pseudo-terminal slave device
- read PTS_DEVICE <$PIPEIN
-
- # Keeping the FIFO open for writing prevents the select call in
- # pseudotty returning EOF after a single "printf something >$PTY_TYPE".
- exec 7>$PTY_TYPE
-
- # glibc can kill a running process if it detects a condition like a
- # double free. This specifies that the message it prints when it does
- # this should be sent to stderr so it can be recorded in the test *.log
- # files.
- LIBC_FATAL_STDERR_=1; export LIBC_FATAL_STDERR
-}
-
-run_ginfo ()
-{
- init_interactive_test
- (
- exec 7>&- ; # Close fd from parent shell
-
- exec $GINFO $GINFO_OPTIONS "$@" 0<>$PTS_DEVICE 1<&0 ; ) &
-
- GINFO_PID=$!
- (sleep 3 ; kill $GINFO_PID) &
-}
Modified: trunk/info/t/Init-test.inc
===================================================================
--- trunk/info/t/Init-test.inc 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/Init-test.inc 2018-08-07 14:45:48 UTC (rev 8015)
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018 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
@@ -103,3 +103,97 @@
GINFO_PID=0
}
+# Functions for interactive tests
+
+
+# we may look up whether a couple of utilities exist.
+
+path_sep=":"
+
+# findprog PROG - Return true if PROG is somewhere in PATH, else false.
+findprog ()
+{
+ saveIFS=$IFS
+ IFS=$path_sep # break path components at the path separator
+ for dir in $PATH; do
+ IFS=$saveIFS
+ # The basic test for an executable is `test -f $f && test -x $f'.
+ # (`test -x' is not enough, because it can also be true for directories.)
+ # We have to try this both for $1 and $1.exe.
+ #
+ # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
+ # also `test -f' has this enhancement, but not on DJGPP. (Both are
+ # design decisions, so there is little chance to make them consistent.)
+ # Thusly, it seems to be difficult to make use of these enhancements.
+ #
+ if { test -f "$dir/$1" && test -x "$dir/$1"; } \
+ || { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
+ return 0
+ fi
+ done
+ return 1
+}
+
+# Initialize test of interactive operation
+init_interactive_test ()
+{
+ test -v initialization_done && return 0
+ initialization_done=1
+
+ # Skip test if pseudotty wasn't built
+ test -x pseudotty || exit 77
+
+ # Avoid ginfo complaining that terminal is too dumb
+ TERM=vt100; export TERM
+
+ # See 'cleanup' function
+ findprog stty && { STTY=stty ; reset_required=yes ; }
+ test $reset_required=yes && { $STTY | grep [-]echo ; } && reset_required=no
+
+ # Create named pipes to communicate with pseudotty program, or quit.
+ rm -f $PIPEIN $PTY_TYPE # must already be defined
+ if findprog mkfifo; then
+ mkfifo $PIPEIN
+ mkfifo $PTY_TYPE
+ #
+ if test ! -r $PIPEIN || test ! -r $PTY_TYPE; then
+ echo "$0: could not mkfifo pipes" >&2
+ exit 77
+ fi
+ # ok, we'll proceed with the test.
+ else
+ echo "$0: mkfifo program not found - cannot make named pipes" >&2
+ exit 77
+ fi
+
+ # We can feed input bytes into $PTY_TYPE to be passed onto ginfo, as
+ # if they were typed by a user in an interactive session.
+ # We redirect to the FIFO within a subshell, because under NetBSD 6.1.4
+ # it hangs otherwise.
+ (exec ./pseudotty "$PTY_TYPE" >$PIPEIN) &
+ PTY_PID=$!
+ # Get name of pseudo-terminal slave device
+ read PTS_DEVICE <$PIPEIN
+
+ # Keeping the FIFO open for writing prevents the select call in
+ # pseudotty returning EOF after a single "printf something >$PTY_TYPE".
+ exec 7>$PTY_TYPE
+
+ # glibc can kill a running process if it detects a condition like a
+ # double free. This specifies that the message it prints when it does
+ # this should be sent to stderr so it can be recorded in the test *.log
+ # files.
+ LIBC_FATAL_STDERR_=1; export LIBC_FATAL_STDERR
+}
+
+run_ginfo ()
+{
+ init_interactive_test
+ (
+ exec 7>&- ; # Close fd from parent shell
+
+ exec $GINFO $GINFO_OPTIONS "$@" 0<>$PTS_DEVICE 1<&0 ; ) &
+
+ GINFO_PID=$!
+ (sleep 3 ; kill $GINFO_PID) &
+}
Modified: trunk/info/t/README
===================================================================
--- trunk/info/t/README 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/README 2018-08-07 14:45:48 UTC (rev 8015)
@@ -19,16 +19,13 @@
. $srcdir/t/Init-test.inc
to allow running at the command line, or with either an in-source or
-out-of-source build with "make check". Tests of interactive operation
-should follow with the line.
+out-of-source build with "make check".
-. $t/Init-inter.inc
-
Any interactive test should also finish with
-. $t/Cleanup.inc
+cleanup
-to cleanup temporary files and spawned processes. This shell snippet
+to cleanup temporary files and spawned processes. This function
will exit with whatever the value of RETVAL is, so you can set the
exit status of the script indicating success or failure.
Modified: trunk/info/t/adjust-anchors.sh
===================================================================
--- trunk/info/t/adjust-anchors.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/adjust-anchors.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
LC_ALL=en_US.ISO8859-1; export LC_ALL
# "ISO8859-1" is what it's known as on NetBSD 5.1 (and not "iso-8859-1"
Modified: trunk/info/t/all-only.sh
===================================================================
--- trunk/info/t/all-only.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/all-only.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Try to stop a "man" command finding a man page called "intera"
MANPATH=.; export MANPATH
Modified: trunk/info/t/anchor-positions.sh
===================================================================
--- trunk/info/t/anchor-positions.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/anchor-positions.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Open a UTF-8 file with anchors in various positions. Check that character
# encoding conversion doesn't cause the program to freeze.
Modified: trunk/info/t/body-start.sh
===================================================================
--- trunk/info/t/body-start.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/body-start.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f body-start
# Check that node headers aren't included in searches
Modified: trunk/info/t/c-u-m-x-scroll-forward.sh
===================================================================
--- trunk/info/t/c-u-m-x-scroll-forward.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/c-u-m-x-scroll-forward.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Set screen geometry so that scrolling down by screens goes to
# predictable places. 5 lines of the node should be visible at once, 1
Modified: trunk/info/t/close-window-after-search.sh
===================================================================
--- trunk/info/t/close-window-after-search.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/close-window-after-search.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
Modified: trunk/info/t/dir-entry-to-subdir.sh
===================================================================
--- trunk/info/t/dir-entry-to-subdir.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/dir-entry-to-subdir.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Follow a dir entry to a file in a subdirectory of infodir
run_ginfo subdir
Modified: trunk/info/t/dir-merge.sh
===================================================================
--- trunk/info/t/dir-merge.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/dir-merge.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
INFOPATH=$INFOPATH:$t/infodir/subdir
Modified: trunk/info/t/echo-area-no-completions.sh
===================================================================
--- trunk/info/t/echo-area-no-completions.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/echo-area-no-completions.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n xrefnode
# Enter echo area and try to follow a cross-reference that doesn't exist
Modified: trunk/info/t/empty-infopath.sh
===================================================================
--- trunk/info/t/empty-infopath.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/empty-infopath.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $srcdir/t/Init-inter.inc
# Check that an empty search path doesn't break. There are no search
# directories here because infopath-no-defaults=On in
Modified: trunk/info/t/end-of-line.sh
===================================================================
--- trunk/info/t/end-of-line.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/end-of-line.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
# Check that typing C-e on an empty line doesn't go to previous line
Modified: trunk/info/t/gc-split.sh
===================================================================
--- trunk/info/t/gc-split.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/gc-split.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f split
# Cause the garbage collector to run in a split file by cancelling an
Modified: trunk/info/t/goal-column.sh
===================================================================
--- trunk/info/t/goal-column.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/goal-column.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n 'Goal column'
Modified: trunk/info/t/goto-quoted.sh
===================================================================
--- trunk/info/t/goto-quoted.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/goto-quoted.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
# Go to a node with colons and commas in its name with "g"
Modified: trunk/info/t/inc-sea-bs.sh
===================================================================
--- trunk/info/t/inc-sea-bs.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/inc-sea-bs.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n Top
Modified: trunk/info/t/inc-sea-forward-nonregex.sh
===================================================================
--- trunk/info/t/inc-sea-forward-nonregex.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/inc-sea-forward-nonregex.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f search
Modified: trunk/info/t/inc-sea-forward.sh
===================================================================
--- trunk/info/t/inc-sea-forward.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/inc-sea-forward.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f search
Modified: trunk/info/t/inc-sea-history.sh
===================================================================
--- trunk/info/t/inc-sea-history.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/inc-sea-history.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f inc-sea-history
Modified: trunk/info/t/inc-sea-insensitive.sh
===================================================================
--- trunk/info/t/inc-sea-insensitive.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/inc-sea-insensitive.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n 'Incremental search case-insensitive'
Modified: trunk/info/t/index-apropos.sh
===================================================================
--- trunk/info/t/index-apropos.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/index-apropos.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo
Modified: trunk/info/t/index-completing.sh
===================================================================
--- trunk/info/t/index-completing.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/index-completing.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f index-search
# Check that pressing tab to complete works for index search
Modified: trunk/info/t/index-long-nodeline.sh
===================================================================
--- trunk/info/t/index-long-nodeline.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/index-long-nodeline.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f split
# Follow an menu item from the index node to a node where physical lines
Modified: trunk/info/t/index-search.sh
===================================================================
--- trunk/info/t/index-search.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/index-search.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
# Search in indices with 'virtual-index' command. Go down to index
Modified: trunk/info/t/index.sh
===================================================================
--- trunk/info/t/index.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/index.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
# Follow an index entry
Modified: trunk/info/t/last-no-history.sh
===================================================================
--- trunk/info/t/last-no-history.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/last-no-history.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
Modified: trunk/info/t/last-node-not-top-level.sh
===================================================================
--- trunk/info/t/last-node-not-top-level.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/last-node-not-top-level.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f last-node-not-top-level -v scroll-last-node=Top
Modified: trunk/info/t/malformed-split.sh
===================================================================
--- trunk/info/t/malformed-split.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/malformed-split.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Load a split file with a malformed or missing tag table.
Modified: trunk/info/t/menu-sequence.sh
===================================================================
--- trunk/info/t/menu-sequence.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/menu-sequence.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
# M-x menu-sequence
Modified: trunk/info/t/next-quoted.sh
===================================================================
--- trunk/info/t/next-quoted.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/next-quoted.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
# Go to a node with colons and commas in its name with "n"
Modified: trunk/info/t/no-index.sh
===================================================================
--- trunk/info/t/no-index.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/no-index.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f sample
# Try to search in the indices when there aren't any
Modified: trunk/info/t/quoted-label-and-target.sh
===================================================================
--- trunk/info/t/quoted-label-and-target.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/quoted-label-and-target.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
Modified: trunk/info/t/quoted-label-as-target.sh
===================================================================
--- trunk/info/t/quoted-label-as-target.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/quoted-label-as-target.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
# Follow a cross-reference to a node with colons and commas in its name
Modified: trunk/info/t/quoted-manual-in-label.sh
===================================================================
--- trunk/info/t/quoted-manual-in-label.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/quoted-manual-in-label.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
# Follow a cross-reference with a manual and quoted nodename in the label.
Modified: trunk/info/t/quoted-manual-in-target.sh
===================================================================
--- trunk/info/t/quoted-manual-in-target.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/quoted-manual-in-target.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
# Follow a cross-reference with a manual and quoted nodename in the target,
Modified: trunk/info/t/quoted-target.sh
===================================================================
--- trunk/info/t/quoted-target.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/quoted-target.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f quoting
# Follow a cross-reference to a node with colons and commas in its name
Modified: trunk/info/t/relative-reference.sh
===================================================================
--- trunk/info/t/relative-reference.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/relative-reference.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Split window with C-x 2, follow menu entry with a slash in the filename.
# Close window (so destination file will be forgotten), and do it again with
Modified: trunk/info/t/replace-viewed.sh
===================================================================
--- trunk/info/t/replace-viewed.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/replace-viewed.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Test of replacing a file while it is being viewed
Modified: trunk/info/t/resize-in-completions.sh
===================================================================
--- trunk/info/t/resize-in-completions.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/resize-in-completions.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Indicate a window resize while showing a completions window
Modified: trunk/info/t/search-after-tag.sh
===================================================================
--- trunk/info/t/search-after-tag.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/search-after-tag.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n Searching
# Search for text in a node that appears after an Info tag
Modified: trunk/info/t/search-empty.sh
===================================================================
--- trunk/info/t/search-empty.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/search-empty.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
# Search without specifying a search string, and check we don't crash.
Modified: trunk/info/t/search-skip-screen.sh
===================================================================
--- trunk/info/t/search-skip-screen.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/search-skip-screen.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -v search-skip-screen=Off -f search
Modified: trunk/info/t/search-split-after-index.sh
===================================================================
--- trunk/info/t/search-split-after-index.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/search-split-after-index.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Search for text in a split file after loading an index entry from the
# command-line.
Modified: trunk/info/t/split-file-menu.sh
===================================================================
--- trunk/info/t/split-file-menu.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/split-file-menu.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f split 'Second'
Modified: trunk/info/t/split-footnotes.sh
===================================================================
--- trunk/info/t/split-footnotes.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/split-footnotes.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
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.
Modified: trunk/info/t/split-index.sh
===================================================================
--- trunk/info/t/split-index.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/split-index.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Follow an index entry in a split file
Modified: trunk/info/t/star-note-non-whitespace.sh
===================================================================
--- trunk/info/t/star-note-non-whitespace.sh 2018-08-07 14:27:31 UTC (rev
8014)
+++ trunk/info/t/star-note-non-whitespace.sh 2018-08-07 14:45:48 UTC (rev
8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n 'Star note non-whitespace'
Modified: trunk/info/t/tab-argument.sh
===================================================================
--- trunk/info/t/tab-argument.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/tab-argument.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n 'Argument to tab'
# C-u 2 TAB to go to second link
Modified: trunk/info/t/tab-no-xref.sh
===================================================================
--- trunk/info/t/tab-no-xref.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/tab-no-xref.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -v scroll-last-node=Top -f no-xref.info
# Check that pressing tab in a file with no cross-references or menus
Modified: trunk/info/t/tab-skip-node.sh
===================================================================
--- trunk/info/t/tab-skip-node.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/tab-skip-node.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f tab-skip-node
# Check that skipping over a node with no cross-references in it
Modified: trunk/info/t/tab.sh
===================================================================
--- trunk/info/t/tab.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/tab.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera
# Tab to first link and follow it
Modified: trunk/info/t/window-split-dir.sh
===================================================================
--- trunk/info/t/window-split-dir.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/window-split-dir.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
# Load dir node
run_ginfo
Modified: trunk/info/t/xref-across-lines-2.sh
===================================================================
--- trunk/info/t/xref-across-lines-2.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/xref-across-lines-2.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n "Xref target crosses lines 2"
printf '\t\rDq' >$PTY_TYPE
Modified: trunk/info/t/xref-across-lines.sh
===================================================================
--- trunk/info/t/xref-across-lines.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/xref-across-lines.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f intera -n 'Xref target crosses lines'
printf '\t\rDq' >$PTY_TYPE
Modified: trunk/info/t/xref-to-anchor.sh
===================================================================
--- trunk/info/t/xref-to-anchor.sh 2018-08-07 14:27:31 UTC (rev 8014)
+++ trunk/info/t/xref-to-anchor.sh 2018-08-07 14:45:48 UTC (rev 8015)
@@ -16,7 +16,6 @@
srcdir=${srcdir:-.}
. $srcdir/t/Init-test.inc
-. $t/Init-inter.inc
run_ginfo -f xref_to_anchor
# Follow cross-reference to an anchor
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8015] remove Init-inter.inc as separate file,
gavinsmith0123 <=