texinfo ChangeLog install-info/tests/defs.in in...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/26 18:30:49

Modified files:
        .              : ChangeLog 
        install-info/tests: defs.in ii-0041-test ii-0050-test 

Log message:
        check for zdiff in tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1458&r2=1.1459
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/defs.in?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/ii-0041-test?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/install-info/tests/ii-0050-test?cvsroot=texinfo&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1458
retrieving revision 1.1459
diff -u -b -r1.1458 -r1.1459
--- ChangeLog   26 Nov 2012 01:46:07 -0000      1.1458
+++ ChangeLog   26 Nov 2012 18:30:49 -0000      1.1459
@@ -1,6 +1,9 @@
 2012-11-26  Karl Berry  <address@hidden>
 
-       * pretest 4.13.91.
+       * install-info/defs.in (findprog): new fn, from texi2dvi.
+       * install-info/tests/ii-0050-test,
+       * install-info/tests/ii-0041-test: use it to check for zdiff
+       (not available on bare Solaris) and skip tests if needed.
 
 2012-11-25  Karl Berry  <address@hidden>
 

Index: install-info/tests/defs.in
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/defs.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- install-info/tests/defs.in  11 Nov 2012 00:33:54 -0000      1.2
+++ install-info/tests/defs.in  26 Nov 2012 18:30:49 -0000      1.3
@@ -1,5 +1,5 @@
 # @configure_input@
-# $Id: defs.in,v 1.2 2012/11/11 00:33:54 karl Exp $
+# $Id: defs.in,v 1.3 2012/11/26 18:30:49 karl Exp $
 # 
 # Copyright 2008, 2012 Free Software Foundation, Inc.
 #
@@ -38,7 +38,32 @@
    test $srcdir = $0 && srcdir=.
 fi
 
-# The two variables we use in the test scripts.
+# Return true if PROG is somewhere in PATH, else false.
+findprog ()
+{
+  local 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
+}
+
+
+# Two variables we use in the test scripts.
 
 address@hidden@
 install_info=${top_builddir}/install-info/ginstall-info

Index: install-info/tests/ii-0041-test
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/ii-0041-test,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- install-info/tests/ii-0041-test     13 Nov 2012 18:30:41 -0000      1.7
+++ install-info/tests/ii-0041-test     26 Nov 2012 18:30:49 -0000      1.8
@@ -11,22 +11,19 @@
 
 tempfile=`mktemp ii41-XXXXXXXX`
 outputdirfile=$tempfile.gz
-cp ${testdir}/ii-0041-input-dir-file.gz $outputdirfile
-if [ "x$?" != "x0" ]; then
-  exit 1
-fi
+cp ${testdir}/ii-0041-input-dir-file.gz $outputdirfile || exit $?
 
 # when copying in distcheck, source will be readonly.
 chmod u+rw $outputdirfile || exit $?
 
-${install_info} ${testdir}/ii-0041-input-info-file $outputdirfile
-retval=$?
-if [ "x$retval" != "x0" ]; then
-  exit $retval
-fi
+${install_info} ${testdir}/ii-0041-input-info-file $outputdirfile || exit $?
 
-zdiff ${testdir}/ii-0041-expected-dir-file.gz $outputdirfile
-retval=$?
+if findprog zdiff; then
+  zdiff ${testdir}/ii-0041-expected-dir-file.gz $outputdirfile
+  retval=$?
+else
+  retval=77
+fi
 
 rm -f $tempfile $outputdirfile
 exit $retval

Index: install-info/tests/ii-0050-test
===================================================================
RCS file: /sources/texinfo/texinfo/install-info/tests/ii-0050-test,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- install-info/tests/ii-0050-test     13 Nov 2012 18:30:41 -0000      1.7
+++ install-info/tests/ii-0050-test     26 Nov 2012 18:30:49 -0000      1.8
@@ -11,23 +11,20 @@
 
 tempfile=`mktemp ii50-XXXXXXXX`
 outputdirfile=$tempfile.gz
-cp ${testdir}/ii-0050-input-dir-file.gz $outputdirfile
-if [ "x$?" != "x0" ]; then
-  exit 1
-fi
-
+cp ${testdir}/ii-0050-input-dir-file.gz $outputdirfile || exit $?
 
 # when copying in distcheck, source will be readonly.
 chmod u+rw $outputdirfile || exit $?
 
-${install_info} --remove ${testdir}/ii-0050-input-info-file $outputdirfile
-retval=$?
-if [ "x$retval" != "x0" ]; then
-  exit $retval
-fi
+${install_info} --remove ${testdir}/ii-0050-input-info-file $outputdirfile \
+|| exit $?
 
-zdiff ${testdir}/ii-0050-expected-dir-file.gz $outputdirfile
-retval=$?
+if findprog zdiff; then
+  zdiff ${testdir}/ii-0050-expected-dir-file.gz $outputdirfile
+  retval=$?
+else
+  retval=77
+fi
 
 rm -f $tempfile $outputdirfile
 exit $retval