* tests/aclocal.in: Remove use of $ACLOCAL_TESTSUITE_FLAGS and
extra `-I' flags; they are not really required, since the file
`m4/amversion.m4' is generated in the srcdir anyway.
* tests/acloca10.test: Remove use of $ACLOCAL_TESTSUITE_FLAGS.
* tests/acloca18.test: Likewise.
* tests/defs.in: Don't nullify $ACLOCAL_TESTSUITE_FLAGS, and do
not export it.
---
ChangeLog | 11 +++++++++++
tests/acloca10.test | 5 ++---
tests/acloca18.test | 21 +++++++--------------
tests/aclocal.in | 3 +--
tests/defs.in | 3 ---
5 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 065ea21..70410d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2011-09-02 Stefano Lattarini <stefano.lattar...@gmail.com>
+ tests: simplify wrapper for aclocal
+ * tests/aclocal.in: Remove use of $ACLOCAL_TESTSUITE_FLAGS and
+ extra `-I' flags; they are not really required, since the file
+ `m4/amversion.m4' is generated in the srcdir anyway.
+ * tests/acloca10.test: Remove use of $ACLOCAL_TESTSUITE_FLAGS.
+ * tests/acloca18.test: Likewise.
+ * tests/defs.in: Don't nullify $ACLOCAL_TESTSUITE_FLAGS, and do
+ not export it.
+
+2011-09-02 Stefano Lattarini <stefano.lattar...@gmail.com>
+
coverage: vala support failing for VPATH from-scratch builds
* tests/vala-vpath.test: New test, xfailing.
* tests/Makefile.am (TESTS): Update.
diff --git a/tests/acloca10.test b/tests/acloca10.test
index 7716f2a..d7a058f 100755
--- a/tests/acloca10.test
+++ b/tests/acloca10.test
@@ -65,8 +65,7 @@ grep MACRO3 aclocal.m4
test ! -f m4_1/macro.m4
test ! -f m4_2/macro.m4
-ACLOCAL_TESTSUITE_FLAGS='-I m4_1 -I m4_2'
-$ACLOCAL --install
+$ACLOCAL -I m4_1 -I m4_2 --install
$AUTOCONF
./configure
grep macro11 foo
@@ -78,7 +77,7 @@ test ! -f m4_2/macro.m4
cp aclocal.m4 copy.m4
echo '#GREPME' >>dirlist-test/macro.m4
-$ACLOCAL --install
+$ACLOCAL -I m4_1 -I m4_2 --install
$AUTOCONF
./configure
grep macro11 foo
diff --git a/tests/acloca18.test b/tests/acloca18.test
index 9826892..5032a8d 100755
--- a/tests/acloca18.test
+++ b/tests/acloca18.test
@@ -53,52 +53,45 @@ cat >4/mumble.m4 <<EOF
AC_DEFUN([AM_MACRO1], [echo macro14 >> foo])
EOF
-
-ACLOCAL_TESTSUITE_FLAGS='-I 1 -I 2 -I 3 -I 4'
-
-$ACLOCAL
+$ACLOCAL -I 1 -I 2 -I 3 -I 4
$AUTOCONF
./configure
grep macro11 foo
grep macro21 foo
rm -f foo
-$ACLOCAL --install
+$ACLOCAL -I 1 -I 2 -I 3 -I 4 --install
$AUTOCONF
./configure
grep macro12 foo
grep macro23 foo
-ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2 -I 3'
rm -f foo
-$ACLOCAL --install --dry-run
+$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install --dry-run
$AUTOCONF
./configure
grep macro12 foo
grep macro23 foo
rm -f foo
-$ACLOCAL --install
+$ACLOCAL -I 4 -I 1 -I 2 -I 3 --install
$AUTOCONF
./configure
grep macro14 foo
grep macro23 foo
-ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2'
rm -f foo
-$ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
cat stderr >&2
grep 'macro.*AM_MACRO2.*not found' stderr
-ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1'
rm -f foo
-$ACLOCAL --install
+$ACLOCAL -I 4 -I 1 --install
$AUTOCONF
./configure
grep macro14 foo
grep macro21 foo
-
mkdir dirlist-test
cat >dirlist-test/m1.m4 <<EOF
#serial 456
@@ -106,7 +99,7 @@ AC_DEFUN([AM_MACRO1], [echo macro1d >> foo])
AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
EOF
rm -f foo
-$ACLOCAL --diff=diff >stdout 2>stderr || {
+$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
cat stderr >&2
cat stdout
Exit 1
diff --git a/tests/aclocal.in b/tests/aclocal.in
index 35b1619..f8aa1a7 100644
--- a/tests/aclocal.in
+++ b/tests/aclocal.in
@@ -14,5 +14,4 @@
perllibdir="@abs_top_builddir@/lib@PATH_SEPARATOR@@abs_top_srcdir@/lib"
export perllibdir
# Most of the files are in $srcdir/../m4. However amversion.m4 is
# generated in ../m4, so we include that directory in the search path too.
-exec "@abs_top_builddir@/aclocal" $ACLOCAL_TESTSUITE_FLAGS \
- -I "@abs_top_builddir@/m4" "--acdir=@abs_top_srcdir@/m4" ${1+"$@"}
+exec "@abs_top_builddir@/aclocal" "--acdir=@abs_top_srcdir@/m4" ${1+"$@"}
diff --git a/tests/defs.in b/tests/defs.in
index 7759455..f999092 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -106,9 +106,6 @@ test -z "$MISSING" && MISSING=`pwd`/../lib/missing
# Use -Werror because this also turns some Perl warnings into error.
# (Tests for which this is inappropriate should use -Wno-error.)
test -z "$ACLOCAL" && ACLOCAL="aclocal-$APIVERSION -Werror"
-# Extra flags to pass to aclocal before all other flags added by this script.
-ACLOCAL_TESTSUITE_FLAGS=
-export ACLOCAL_TESTSUITE_FLAGS
# See how Automake should be run. We put --foreign as the default
# strictness to avoid having to create lots and lots of files. A test
--
1.7.2.3
