* tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now

that we have fake version in the $PATH.

diff --git a/ChangeLog b/ChangeLog
index 810244c3c8ead5e8b380b74d401067fa016140c6..671c06cbcafd92de3753db26ca88cd35ef973e9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-07  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
+       that we have fake version in the $PATH.
+
        * aclocal.in (add_file): Remove useless filling of $output, probably
        left a after CVS conflict.  This code is now in write_aclocal.
 

diff --git a/tests/instsh.test b/tests/instsh.test
index b97989d761d9405821a18a601bf96d08f76e300e..29e3c0ce69a74c828c1e77a2d125328e6b2c8509 100755 (executable)
--- a/tests/instsh.test
+++ b/tests/instsh.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1996, 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -24,6 +24,8 @@
 
 . ./defs || exit 1
 
+set -e
+
 : > Makefile.am
 rm -f install-sh
 
@@ -33,26 +35,11 @@ mkdir frob
 mv Makefile.am configure.in mkinstalldirs frob/
 cd frob
 
-# If srcdir is relative, we need to modify it.
-case "$srcdir" in
- [\\/]* | ?:[\\/]*)
-    ;;
-
- *)
-    srcdir="../$srcdir"
-    ;;
-esac
-
-AUTOMAKE="$PERL ../../../automake --libdir=$testsrcdir/../lib --foreign --Werror"
-ACLOCAL="$PERL ../../../aclocal -I ../../../m4 --acdir=$testsrcdir/../m4"
-
-# Now we proceed with the test
-$ACLOCAL || exit 1
-$AUTOMAKE --add-missing > output 2>&1 \
-   || exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing > output 2>&1
 
 # Only one `/' should appear in the output.
-grep '/.*/' output \
-   && exit 1
+cat output
+grep '/.*/' output && exit 1
 
 test -f install-sh