tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / t / instdir-texi.sh

diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
old mode 100755 (executable)
new mode 100644 (file)
index 33bf636..6f30419
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 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
@@ -18,7 +18,7 @@
 # Likewise for the other install-* targets used for texinfo files.
 
 required='makeinfo tex texi2dvi'
-. ./defs || exit 1
+. test-init.sh
 
 dvips --help \
   || skip_ "dvips is missing"
@@ -56,18 +56,7 @@ cd build
 $MAKE all dvi ps pdf html
 ls -l
 
-infodir= htmldir= dvidir= psdir= pdfdir=
-export infodir htmldir dvidir psdir pdfdir
-
-$MAKE -e install install-html install-dvi install-ps install-pdf
-test ! -e "$instdir"
-$MAKE -e install install-html install-dvi install-ps install-pdf \
-         DESTDIR="$destdir"
-test ! -e "$instdir"
-test ! -e "$destdir"
-$MAKE -e uninstall > stdout || { cat stdout; exit 1; }
-cat stdout
-grep 'rm -f' stdout && exit 1
-$MAKE -e uninstall DESTDIR="$destdir"
+nulldirs='infodir= htmldir= dvidir= psdir= pdfdir='
+null_install --texi
 
 :