[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6275] try to get word splitting for GINFO in info tests
|
From: |
Gavin D. Smith |
|
Subject: |
[6275] try to get word splitting for GINFO in info tests |
|
Date: |
Sun, 17 May 2015 20:57:24 +0000 |
Revision: 6275
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6275
Author: gavin
Date: 2015-05-17 20:57:22 +0000 (Sun, 17 May 2015)
Log Message:
-----------
try to get word splitting for GINFO in info tests
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/t/Init-inter.inc
trunk/info/t/Init-test.inc
trunk/info/t/cr-tag-table.sh
trunk/info/t/dir-3-menus.sh
trunk/info/t/dir-file-index.sh
trunk/info/t/dir-file-menu.sh
trunk/info/t/dir-file-no-menu.sh
trunk/info/t/dir-file-node.sh
trunk/info/t/dir-file-sloppily.sh
trunk/info/t/dir-file.sh
trunk/info/t/dir-menus-sloppily.sh
trunk/info/t/dir-no-file.sh
trunk/info/t/dir-nondir.sh
trunk/info/t/dir.sh
trunk/info/t/file-file-with-dot.sh
trunk/info/t/file.sh
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/ChangeLog 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,15 @@
2015-05-17 Gavin Smith <address@hidden>
+ * info/t/Init-test.inc: Split GINFO variable into GINFO and
+ GINFO_OPTIONS, and provide GINFO alias to use them together.
+ * info/t/Init-inter.inc: Pass GINFO_OPTIONS variable as
+ arguments to GINFO. (Attempt at fixing error message on
+ Solaris 10, "./ginfo --init-file ./t/Infokey-config: not found".
+ Maybe word splitting isn't happening.)
+ * info/t/*.sh: Use GINFO alias instead of $GINFO.
+
+2015-05-17 Gavin Smith <address@hidden>
+
* info/t/index-apropos.sh: Don't run printf in background to
pass input keystrokes into program. (Attempt at fixing test
failure reported by Assaf Gordon.)
Modified: trunk/info/t/Init-inter.inc
===================================================================
--- trunk/info/t/Init-inter.inc 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/Init-inter.inc 2015-05-17 20:57:22 UTC (rev 6275)
@@ -154,7 +154,8 @@
{
rm -f $FINISHEDFIFO
mkfifo $FINISHEDFIFO
- { $GINFO "$@" ; test $? -eq 0 || echo failure >$FINISHEDFIFO ;
+ { $GINFO $GINFO_OPTIONS "$@" ;
+ test $? -eq 0 || echo failure >$FINISHEDFIFO ;
echo finished >$FINISHEDFIFO ; } 0<>$PTS_DEVICE 1<&0 &
SUBSHELL=$!
Modified: trunk/info/t/Init-test.inc
===================================================================
--- trunk/info/t/Init-test.inc 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/Init-test.inc 2015-05-17 20:57:22 UTC (rev 6275)
@@ -20,9 +20,12 @@
srcdir=${srcdir:-.}
# Use the second line to run the program under valgrind.
-GINFO="./ginfo --init-file $srcdir/t/Infokey-config"
+GINFO="./ginfo"
+GINFO_OPTIONS="--init-file $srcdir/t/Infokey-config"
#GINFO="valgrind --log-file=$0.val.log --leak-check=full ./ginfo --init-file
$srcdir/t/Infokey-config"
+alias GINFO='${GINFO} ${GINFO_OPTIONS}'
+
# Set this to the name of the process
GINFO_NAME=ginfo
#GINFO_NAME=memcheck-x86-li
Modified: trunk/info/t/cr-tag-table.sh
===================================================================
--- trunk/info/t/cr-tag-table.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/cr-tag-table.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -23,8 +23,8 @@
# Programmer's Guide" (23NOV2013 build of GNU COBOL 2.1),
# "gnucobpg.info", to be inaccessible when the error has built up to be
# more than the 1000 bytes of tolerance.
-$GINFO --strict-node-location --file cr-tag-table.info \
- --node Second >$GINFO_OUTPUT
+GINFO --strict-node-location --file cr-tag-table.info \
+ --node Second >$GINFO_OUTPUT
grep 'Node: Second' $GINFO_OUTPUT
RETVAL=$?
Modified: trunk/info/t/dir-3-menus.sh
===================================================================
--- trunk/info/t/dir-3-menus.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-3-menus.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,6 +18,6 @@
. $srcdir/t/Init-test.inc
# Follow several menus in a file to get to desired node
-$GINFO --output - file-menu 'First entry' 'Node 2' 'Node 3' \
+GINFO --output - file-menu 'First entry' 'Node 2' 'Node 3' \
| grep 'Arrived at Node 3.'
Modified: trunk/info/t/dir-file-index.sh
===================================================================
--- trunk/info/t/dir-file-index.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-file-index.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,5 +18,5 @@
. $srcdir/t/Init-test.inc
# Follow an index entry in a file found through dir
-$GINFO --output - split 'entry text' \
+GINFO --output - split 'entry text' \
| grep 'Node: Target node'
Modified: trunk/info/t/dir-file-menu.sh
===================================================================
--- trunk/info/t/dir-file-menu.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-file-menu.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,5 +18,5 @@
. $srcdir/t/Init-test.inc
# Follow a menu in a file
-$GINFO --output - file-menu 'First entry' | grep 'Arrived at Node 1.'
+GINFO --output - file-menu 'First entry' | grep 'Arrived at Node 1.'
Modified: trunk/info/t/dir-file-no-menu.sh
===================================================================
--- trunk/info/t/dir-file-no-menu.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-file-no-menu.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,5 +18,5 @@
. $srcdir/t/Init-test.inc
# Try to select a non-existent menu item
-$GINFO --output - file-menu 'Not an entry' 2>&1 | grep 'No menu item'
+GINFO --output - file-menu 'Not an entry' 2>&1 | grep 'No menu item'
Modified: trunk/info/t/dir-file-node.sh
===================================================================
--- trunk/info/t/dir-file-node.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-file-node.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -20,5 +20,5 @@
# Load a node in loaded file using --node, without using --file to
# specify the desired file.
-$GINFO --output - file-menu --node Unreachable \
+GINFO --output - file-menu --node Unreachable \
| grep 'not linked to elsewhere'
Modified: trunk/info/t/dir-file-sloppily.sh
===================================================================
--- trunk/info/t/dir-file-sloppily.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-file-sloppily.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,4 +18,4 @@
. $srcdir/t/Init-test.inc
# Follow an reference to "file-menu" in dir without matching label exactly
-$GINFO --output - FiLe-M | grep "^File: file-menu,"
+GINFO --output - FiLe-M | grep "^File: file-menu,"
Modified: trunk/info/t/dir-file.sh
===================================================================
--- trunk/info/t/dir-file.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-file.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,4 +18,4 @@
. $srcdir/t/Init-test.inc
# Follow a reference to file1 in dir
-$GINFO --output - file1
+GINFO --output - file1
Modified: trunk/info/t/dir-menus-sloppily.sh
===================================================================
--- trunk/info/t/dir-menus-sloppily.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-menus-sloppily.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,6 +18,6 @@
. $srcdir/t/Init-test.inc
# Follow several menus in a file inexactly to get to desired node
-$GINFO --output - file-menu first nod nod \
+GINFO --output - file-menu first nod nod \
| grep 'Arrived at Node 3.'
Modified: trunk/info/t/dir-no-file.sh
===================================================================
--- trunk/info/t/dir-no-file.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-no-file.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -24,4 +24,4 @@
# the dir node, but the former does not output the dir node, just an
# error message.
-$GINFO --output - not-a-file 2>&1 | grep 'No menu item'
+GINFO --output - not-a-file 2>&1 | grep 'No menu item'
Modified: trunk/info/t/dir-nondir.sh
===================================================================
--- trunk/info/t/dir-nondir.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir-nondir.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,4 +18,4 @@
. $srcdir/t/Init-test.inc
# Load a file despite it not being listed in dir.
-$GINFO --output - sample | grep "This is a simple Info file."
+GINFO --output - sample | grep "This is a simple Info file."
Modified: trunk/info/t/dir.sh
===================================================================
--- trunk/info/t/dir.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/dir.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,4 +18,4 @@
. $srcdir/t/Init-test.inc
# Load top-level dir node
-${GINFO} --output -
+GINFO --output -
Modified: trunk/info/t/file-file-with-dot.sh
===================================================================
--- trunk/info/t/file-file-with-dot.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/file-file-with-dot.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,5 +18,5 @@
. $srcdir/t/Init-test.inc
# Follow a menu in a file where the filename contains a full stop.
-$GINFO --output - -f file-menu Target | grep 'File: file1'
+GINFO --output - -f file-menu Target | grep 'File: file1'
Modified: trunk/info/t/file.sh
===================================================================
--- trunk/info/t/file.sh 2015-05-17 17:09:50 UTC (rev 6274)
+++ trunk/info/t/file.sh 2015-05-17 20:57:22 UTC (rev 6275)
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (C) 2014 Free Software Foundation, Inc.
+# 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
@@ -18,7 +18,7 @@
. $srcdir/t/Init-test.inc
# Check that we can reach a file with --file
-$GINFO --file file-menu >$GINFO_OUTPUT
+GINFO --file file-menu >$GINFO_OUTPUT
# Check that the entire file was dumped, and not just the Top node
grep 'Node: Top' $GINFO_OUTPUT \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6275] try to get word splitting for GINFO in info tests,
Gavin D. Smith <=