25-fyi-fix-tests.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * tests/install.test: This test is an empty shell, do not run
        automake.
        * tests/Makefile.am (TESTS): Don't run it.
        * tests/defs (ACLOCAL): When using gettext, pass in the installed
        aclocaldir.
        * tests/subdircond.test (SUBDIRS): AM_GNU_GETTEXT needs automake
        --add--missing.
        * tests/obsolete2.test: Remove, merged into...
        * tests/obsolete.test: here.
        Both aclocal and automake should complain.

Index: tests/Makefile.am
--- tests/Makefile.am Fri, 12 Oct 2001 14:43:57 +0200 akim
+++ tests/Makefile.am Sun, 21 Oct 2001 13:29:18 +0200 akim
@@ -155,7 +155,6 @@
 info.test \
 insh.test \
 insh2.test \
-install.test \
 install2.test \
 installsh.test \
 instdata.test \
@@ -217,7 +216,6 @@
 nostdinc.test \
 number.test \
 obsolete.test \
-obsolete2.test \
 order.test \
 outdir.test \
 output.test \
Index: tests/Makefile.in
--- tests/Makefile.in Sat, 13 Oct 2001 20:31:52 +0200 akim
+++ tests/Makefile.in Sun, 21 Oct 2001 12:46:31 +0200 akim
@@ -288,7 +288,6 @@
 nostdinc.test \
 number.test \
 obsolete.test \
-obsolete2.test \
 order.test \
 outdir.test \
 output.test \
Index: tests/defs
--- tests/defs Sun, 21 Oct 2001 11:04:02 +0200 akim
+++ tests/defs Sun, 21 Oct 2001 12:49:03 +0200 akim
@@ -113,7 +113,7 @@
 # Find them on the system.
 aclocaldir=`(aclocal --print-ac-dir) 2>/dev/null`
 case $required in
-  *libtool*)
+  *libtool* | *gettext* )
     ACLOCAL="$ACLOCAL -I $aclocaldir"
     ;;
 esac
Index: tests/install.test
--- tests/install.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/install.test Sun, 21 Oct 2001 13:28:24 +0200 akim
@@ -14,7 +14,7 @@
 # might be required are actually included in the automake
 # distribution.
 # $ACLOCAL || exit 1
-$AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1
+# $AUTOMAKE --gnu --add-missing > output 2>&1 && exit 1
 # grep installing output

 exit 0
Index: tests/obsolete.test
--- tests/obsolete.test Sun, 21 Oct 2001 11:33:02 +0200 akim
+++ tests/obsolete.test Sun, 21 Oct 2001 12:45:54 +0200 akim
@@ -10,6 +10,10 @@

 : > Makefile.am

-$ACLOCAL || exit 1
-$AUTOMAKE && exit 1
+$ACLOCAL  2>stderr          && exit 1
+grep AC_PROG_INSTALL stderr || exit 1
+
+$AUTOMAKE 2>stderr          && exit 1
+grep AC_PROG_INSTALL stderr || exit 1
+
 exit 0
Index: tests/subdircond.test
--- tests/subdircond.test Sun, 21 Oct 2001 11:33:02 +0200 akim
+++ tests/subdircond.test Sun, 21 Oct 2001 12:49:36 +0200 akim
@@ -22,4 +22,5 @@
 END

 $ACLOCAL || exit 1
-$AUTOMAKE
+# Gettext wants config.guess etc.
+$AUTOMAKE --add-missing
Index: tests/obsolete2.test
--- tests/obsolete2.test Sat, 20 Oct 2001 12:29:22 +0200 akim
+++ tests/obsolete2.test Sun, 21 Oct 2001 13:29:51 +0200 akim
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-# Test to make sure obsolete macros really are.
-
-. $srcdir/defs || exit 1
-
-echo AM_FUNC_FNMATCH >> configure.in
-
-: > Makefile.am
-
-$ACLOCAL || exit 1
-$AUTOMAKE 2> output && exit 1
-
-grep AC_FUNC_FNMATCH output