[6868] remove ii-0058-test for empty dir file

[Gavin D. Smith]

Revision: 6868
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6868
Author:   gavin
Date:     2015-12-16 11:58:14 +0000 (Wed, 16 Dec 2015)
Log Message:
-----------
remove ii-0058-test for empty dir file

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

Added Paths:
-----------
    trunk/install-info/tests/ii-0018-expected-dir-file
    trunk/install-info/tests/ii-0019-expected-dir-file

Removed Paths:
-------------
    trunk/install-info/tests/ii-0058-expected-dir-file
    trunk/install-info/tests/ii-0058-input-dir-file
    trunk/install-info/tests/ii-0058-input-info-file
    trunk/install-info/tests/ii-0058-test

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-12-15 16:07:35 UTC (rev 6867)
+++ trunk/ChangeLog     2015-12-16 11:58:14 UTC (rev 6868)
@@ -1,5 +1,13 @@
 2015-12-15  Gavin Smith  <address@hidden>
 
+       * install-info/tests/ii-0058-test: Remove test, because empty 
+       dir file is already covered by ii-0018-test and ii-0019-test.
+       * install-info/tests/ii-0018-test,
+       install-info/tests/ii-0019-test: Update to account for fact that 
+       an empty dir file now causes the dir file to be re-created.
+
+2015-12-15  Gavin Smith  <address@hidden>
+
        * install-info/tests/ii-0058-test: Work like other tests, for 
        consistency.
        * install-info/tests/Makefile.am: List files relating to this 
@@ -14,9 +22,8 @@
 
        * Mention gettext and automake versions in NEWS.
 
-2015-12-15  Gavin Smith  <address@hidden>
+2015-12-15  gettextize <address@hidden>
 
-       Run gettextize.
        * gnulib/m4/gettext.m4: Upgrade to gettext-0.19.6.
        * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.6.
 

Modified: trunk/install-info/tests/Makefile.am
===================================================================
--- trunk/install-info/tests/Makefile.am        2015-12-15 16:07:35 UTC (rev 
6867)
+++ trunk/install-info/tests/Makefile.am        2015-12-16 11:58:14 UTC (rev 
6868)
@@ -22,7 +22,7 @@
 ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \
 ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test \
 ii-0051-test ii-0052-test ii-0053-test ii-0054-test ii-0055-test \
-ii-0056-test ii-0057-test ii-0058-test
+ii-0056-test ii-0057-test
 
 noinst_SCRIPTS=$(TESTS)
 
@@ -97,9 +97,11 @@
 \
 ii-0018-input-dir-file \
 ii-0018-input-info-file \
+ii-0018-expected-dir-file \
 \
 ii-0019-input-dir-file \
 ii-0019-input-info-file \
+ii-0019-expected-dir-file \
 \
 ii-0020-input-dir-file \
 ii-0020-input-info-file \
@@ -251,8 +253,4 @@
 ii-0057-input-dir-file \
 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-0018-expected-dir-file
===================================================================
(Binary files differ)


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

Modified: trunk/install-info/tests/ii-0018-test
===================================================================
--- trunk/install-info/tests/ii-0018-test       2015-12-15 16:07:35 UTC (rev 
6867)
+++ trunk/install-info/tests/ii-0018-test       2015-12-16 11:58:14 UTC (rev 
6868)
@@ -15,11 +15,14 @@
   exit 1
 fi
 
-${install_info} ${testdir}/ii-0018-input-info-file $outputdirfile 2>/dev/null
+${install_info} ${testdir}/ii-0018-input-info-file $outputdirfile
 retval=$?
-if [ "x$retval" != "x1" ]; then
+if [ "x$retval" != "x0" ]; then
   exit $retval
 fi
 
+diff ${testdir}/ii-0018-expected-dir-file $outputdirfile
+retval=$?
+
 rm -f $outputdirfile
-exit 0
+exit $retval

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


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

Modified: trunk/install-info/tests/ii-0019-test
===================================================================
--- trunk/install-info/tests/ii-0019-test       2015-12-15 16:07:35 UTC (rev 
6867)
+++ trunk/install-info/tests/ii-0019-test       2015-12-16 11:58:14 UTC (rev 
6868)
@@ -15,11 +15,14 @@
   exit 1
 fi
 
-${install_info} ${testdir}/ii-0019-input-info-file $outputdirfile 2>/dev/null
+${install_info} ${testdir}/ii-0019-input-info-file $outputdirfile
 retval=$?
-if [ "x$retval" != "x1" ]; then
+if [ "x$retval" != "x0" ]; then
   exit $retval
 fi
 
+diff ${testdir}/ii-0019-expected-dir-file $outputdirfile
+retval=$?
+
 rm -f $outputdirfile
-exit 0
+exit $retval

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

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

Deleted: trunk/install-info/tests/ii-0058-test
===================================================================
--- trunk/install-info/tests/ii-0058-test       2015-12-15 16:07:35 UTC (rev 
6867)
+++ trunk/install-info/tests/ii-0058-test       2015-12-16 11:58:14 UTC (rev 
6868)
@@ -1,28 +0,0 @@
-#!/bin/sh -x
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-. ./defs || exit 1
-
-outputdirfile=`mktemp ii58-XXXXXXXX`
-cp ${testdir}/ii-0058-input-dir-file $outputdirfile
-if [ "x$?" != "x0" ]; then
-  exit 1
-fi
-
-${install_info} ${testdir}/ii-0058-input-info-file $outputdirfile
-retval=$?
-if [ "x$retval" != "x0" ]; then
-  exit $retval
-fi
-
-diff ${testdir}/ii-0058-expected-dir-file $outputdirfile
-retval=$?
-
-rm -f $outputdirfile
-exit $retval