[6866] fix ii-0058-test test

[Gavin D. Smith]

Revision: 6866
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6866
Author:   gavin
Date:     2015-12-15 15:44:17 +0000 (Tue, 15 Dec 2015)
Log Message:
-----------
fix ii-0058-test test

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/install-info/tests/Makefile.am
    trunk/install-info/tests/ii-0058-test

Added Paths:
-----------
    trunk/install-info/tests/ii-0058-input-dir-file
    trunk/install-info/tests/ii-0058-input-info-file

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-12-15 15:02:17 UTC (rev 6865)
+++ trunk/ChangeLog     2015-12-15 15:44:17 UTC (rev 6866)
@@ -1,10 +1,17 @@
 2015-12-15  Gavin Smith  <address@hidden>
 
-       * doc/info.c (get_initial_file): Change "info" to "info-stnd" if 
-       given as first non-option argument.
+       * install-info/tests/ii-0058-test: Work like other tests, for 
+       consistency.
+       * install-info/tests/Makefile.am: List files relating to this 
+       test.
 
 2015-12-15  Gavin Smith  <address@hidden>
 
+       * info/info.c (get_initial_file): Change "info" to "info-stnd" 
+       if given as first non-option argument.
+
+2015-12-15  Gavin Smith  <address@hidden>
+
        * Mention gettext and automake versions in NEWS.
 
 2015-12-15  Gavin Smith  <address@hidden>

Modified: trunk/install-info/tests/Makefile.am
===================================================================
--- trunk/install-info/tests/Makefile.am        2015-12-15 15:02:17 UTC (rev 
6865)
+++ trunk/install-info/tests/Makefile.am        2015-12-15 15:44:17 UTC (rev 
6866)
@@ -252,4 +252,7 @@
 ii-0057-input-info-file \
 ii-0057-expected-dir-file \
 \
+ii-0058-input-dir-file \
+ii-0058-input-info-file \
+ii-0058-expected-dir-file \
 README

Added: trunk/install-info/tests/ii-0058-input-dir-file
===================================================================
Added: trunk/install-info/tests/ii-0058-input-info-file
===================================================================
(Binary files differ)


Property changes on: trunk/install-info/tests/ii-0058-input-info-file
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/install-info/tests/ii-0058-test
===================================================================
--- trunk/install-info/tests/ii-0058-test       2015-12-15 15:02:17 UTC (rev 
6865)
+++ trunk/install-info/tests/ii-0058-test       2015-12-15 15:44:17 UTC (rev 
6866)
@@ -10,13 +10,12 @@
 . ./defs || exit 1
 
 outputdirfile=`mktemp ii58-XXXXXXXX`
-rm -f $outputdirfile
-touch $outputdirfile
+cp ${testdir}/ii-0058-input-dir-file $outputdirfile
 if [ "x$?" != "x0" ]; then
   exit 1
 fi
 
-${install_info} ${testdir}/ii-0001-input-info-file $outputdirfile
+${install_info} ${testdir}/ii-0058-input-info-file $outputdirfile
 retval=$?
 if [ "x$retval" != "x0" ]; then
   exit $retval