[7259] dir-merge.sh test

[gavinsmith0123]

Revision: 7259
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7259
Author:   gavin
Date:     2016-07-16 10:56:08 +0000 (Sat, 16 Jul 2016)
Log Message:
-----------
dir-merge.sh test

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/Makefile.am

Added Paths:
-----------
    trunk/info/t/dir-merge.sh
    trunk/info/t/infodir/subdir/dir

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-07-14 20:41:16 UTC (rev 7258)
+++ trunk/ChangeLog     2016-07-16 10:56:08 UTC (rev 7259)
@@ -1,3 +1,7 @@
+2016-07-16  Gavin Smith  <address@hidden>
+
+       * info/t/dir-merge.sh: New test.
+
 2016-07-14  Gavin Smith  <address@hidden>
 
        * doc/texinfo.texi (Command List) <@copying>: Correctly say

Modified: trunk/info/Makefile.am
===================================================================
--- trunk/info/Makefile.am      2016-07-14 20:41:16 UTC (rev 7258)
+++ trunk/info/Makefile.am      2016-07-16 10:56:08 UTC (rev 7259)
@@ -97,6 +97,7 @@
        t/dir.sh \
        t/dir-file.sh \
        t/dir-file-sloppily.sh \
+       t/dir-merge.sh \
        t/dir-nondir.sh \
        t/dir-no-file.sh \
        t/dir-file-menu.sh \

Added: trunk/info/t/dir-merge.sh
===================================================================
--- trunk/info/t/dir-merge.sh                           (rev 0)
+++ trunk/info/t/dir-merge.sh   2016-07-16 10:56:08 UTC (rev 7259)
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Copyright (C) 2014, 2015, 2016 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/>.
+
+srcdir=${srcdir:-.}
+. $srcdir/t/Init-test.inc
+. $t/Init-inter.inc
+
+INFOPATH=$INFOPATH:$t/infodir/subdir
+
+# Follow a reference to file in merged dir
+run_ginfo -v hide-note-references=On file-in-subdir
+
+printf q >$PTY_TYPE
+. $t/Timeout-test.inc
+
+cleanup


Property changes on: trunk/info/t/dir-merge.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/info/t/infodir/subdir/dir
===================================================================
(Binary files differ)


Property changes on: trunk/info/t/infodir/subdir/dir
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream