texinfo-4.11 test failure

[Bruno Haible]

Hi Karl,

The "make check" of texinfo-4.11 fails for me, because I have the
texinfo 4.9 binaries installed in my PATH.

$ make check
...
make[2]: Entering directory `/dev/shm/texinfo-4.11/util'
SKIP: bibtex.test
PASS: dvipdf.test
SKIP: latex2html.test
FAIL: texi2dvi.test
====================================
1 of 2 tests failed
(2 tests were not run)
Please report to address@hidden
====================================
make[2]: *** [check-TESTS] Error 1
make[2]: Leaving directory `/dev/shm/texinfo-4.11/util'
make[1]: *** [check-am] Error 2
make[1]: Leaving directory `/dev/shm/texinfo-4.11/util'
make: *** [check-recursive] Error 1

When I run "VERBOSE=1 make check TESTS=texi2dvi.test", the output contains
these lines:

+ verbose 'Copying input.dvi to 
/dev/shm/texinfo-4.11/util/testSubDir/output.dvi/input.dvi'
+ true
+ echo '/packages/gnu/bin/texi2dvi: Copying input.dvi to 
/dev/shm/texinfo-4.11/util/testSubDir/output.dvi/input.dvi'
/packages/gnu/bin/texi2dvi: Copying input.dvi to 
/dev/shm/texinfo-4.11/util/testSubDir/output.dvi/input.dvi
+ cp -p input.dvi /dev/shm/texinfo-4.11/util/testSubDir/output.dvi/input.dvi
cp: reguläre Datei „/dev/shm/texinfo-4.11/util/testSubDir/output.dvi/input.dvi“ 
kann nicht angelegt werden: Datei oder Verzeichnis nicht gefunden

So what's happening is that

  1) Because the test is run in a subdirectory of util/ and because my PATH
     is
       .:/home/bruno/bin:/packages/gnu/bin:...
     it finds the texi2dvi binary in /packages/gnu/bin - it happens to be
     the one from texinfo-4.9.

  2) This texi2dvi script contains these lines:

    if test -n "$dest"; then
      test -f "$dest" || dest="$dest/$file"
      if cmp -s "$file" "$dest"; then :; else
        verbose "Copying $file to $dest"
        cp -p "$file" "$dest"
      fi
    fi

     I.e. it is programmed in such a way that if the user asks to create
     output.dvi, and output.dvi does not exist, the script will attempt
     to create output.dvi/input.dvi and fail. (This was fixed on 2007-07-01.)

This patch fixes it for me.


2007-10-03  Bruno Haible  <address@hidden>

        * util/defs.in (TEXI2DVI_run): Use the TEXI2DVI variable rather than
        invoking the texi2dvi that happens to be installed in $PATH.

diff -r -c3 texinfo-4.11.orig/util/defs.in texinfo-4.11/util/defs.in
*** texinfo-4.11.orig/util/defs.in      2007-07-02 00:28:54.000000000 +0200
--- texinfo-4.11/util/defs.in   2007-10-03 14:57:28.000000000 +0200
***************
*** 198,205 ****
      set x --debug --verbose ${1+"$@"}
      shift
    fi
!   which texi2dvi
!   texi2dvi ${1+"$@"} 2>stderr >stdout || exitcode=$?
    cat stderr
    cat stdout
    test $exitcode = $expected_exitcode || exit 1
--- 198,204 ----
      set x --debug --verbose ${1+"$@"}
      shift
    fi
!   "$TEXI2DVI" ${1+"$@"} 2>stderr >stdout || exitcode=$?
    cat stderr
    cat stdout
    test $exitcode = $expected_exitcode || exit 1