[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: fix instsh.test
From: |
Alexandre Duret-Lutz |
Subject: |
FYI: fix instsh.test |
Date: |
Sun, 07 Sep 2003 14:44:33 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux) |
I'm installing this on HEAD.
2003-09-07 Alexandre Duret-Lutz <address@hidden>
* tests/instsh.test: Do not reset $ACLOCAL and $AUTOMAKE now
that we have fake version in the $PATH.
Index: tests/instsh.test
===================================================================
RCS file: /cvs/automake/automake/tests/instsh.test,v
retrieving revision 1.1
diff -u -r1.1 instsh.test
--- tests/instsh.test 13 Jan 2003 19:17:53 -0000 1.1
+++ tests/instsh.test 7 Sep 2003 12:43:24 -0000
@@ -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 @@
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
--
Alexandre Duret-Lutz
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: fix instsh.test,
Alexandre Duret-Lutz <=