[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: program transform and tests
From: |
Ralf Wildenhues |
Subject: |
Re: program transform and tests |
Date: |
Tue, 9 May 2006 23:26:42 +0200 |
User-agent: |
Mutt/1.5.11+cvs20060403 |
Hi Noah,
* Noah Misch wrote on Tue, May 09, 2006 at 08:09:03PM CEST:
> On Tue, May 09, 2006 at 06:59:12PM +0200, Ralf Wildenhues wrote:
> >
> > | 94: torture.at:972 Unusual Automake input files
> >
> > which fails because the Automake macros in that test use newer syntax;
> Automake 1.8 introduced the feature in question. We should skip this
> test for older Automake.
Agreed. I've installed the first patch below to fix this.
> > * tests/Makefile.am (AUTOTEST): Use `$(MY_AUTOM4TE)' instead of
> > `./autom4te' to create `./testsuite', since the `all' target
> > will ensure its presence, but `installcheck' should not create
> > the uninstalled wrappers.
>
> This is clearly helpful; you could apply it independently.
Agreed. Installed as below, second patch.
> With this approach, `./testsuite' will no longer behave reasonably.
> Logic to default these variables should appear in `testsuite' itself.
> Autotest does not currently provide an interface for performing such
> initializations globally; we would need to add that.
Well, a bunch of
: ${autoconf=autoconf}
...
initializations would fix that. But it's not nice, I agree.
Cheers, and thanks for the review!
Ralf
* tests/Makefile.am (AUTOTEST): Use `$(MY_AUTOM4TE)' instead of
`./autom4te' to create `./testsuite', since the `all' target
will ensure its presence, but `installcheck' should not create
the uninstalled wrappers.
* tests/torture.at (Unusual Automake input files): Skip if we
detect automake < 1.8.
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/Makefile.am,v
retrieving revision 1.100
diff -u -r1.100 Makefile.am
--- tests/Makefile.am 9 Apr 2006 11:36:08 -0000 1.100
+++ tests/Makefile.am 9 May 2006 21:22:24 -0000
@@ -109,7 +109,7 @@
# Run the non installed autom4te.
# Don't use AUTOM4TE since `make alpha' makes it unavailable although
# we are allowed to use it (since we ship it).
-AUTOTEST = ./autom4te --language=autotest
+AUTOTEST = $(MY_AUTOM4TE) --language=autotest
$(TESTSUITE): $(srcdir)/package.m4 \
local.at \
$(TESTSUITE_AT) \
Index: tests/Makefile.in
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/Makefile.in,v
retrieving revision 1.166
diff -u -r1.166 Makefile.in
--- tests/Makefile.in 12 Apr 2006 23:11:13 -0000 1.166
+++ tests/Makefile.in 9 May 2006 21:22:24 -0000
@@ -236,7 +236,7 @@
# Run the non installed autom4te.
# Don't use AUTOM4TE since `make alpha' makes it unavailable although
# we are allowed to use it (since we ship it).
-AUTOTEST = ./autom4te --language=autotest
+AUTOTEST = $(MY_AUTOM4TE) --language=autotest
# The files which contain macros we check for syntax. Use $(top_srcdir)
# for the benefit of non-GNU make. Fix the names in the rule below
Index: tests/torture.at
===================================================================
RCS file: /cvsroot/autoconf/autoconf/tests/torture.at,v
retrieving revision 1.60
diff -u -r1.60 torture.at
--- tests/torture.at 6 May 2006 05:53:50 -0000 1.60
+++ tests/torture.at 9 May 2006 21:24:42 -0000
@@ -1004,10 +1004,11 @@
AT_DATA([HeeHee.am],
[[# Humans do no worse than `GNUmakefile.am'.
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.8
]])
-AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [ignore])
+AT_CHECK([autoreconf -Wall -v -i], 0, [ignore], [stderr],
+ [AT_CHECK([grep 'require.*1\.8' stderr && exit 77], [1])])
AT_CHECK([test -f HeeHee.in])
AT_CLEANUP