It's really nice to mention stuff exactly once. :-)
OK to apply this to HEAD? It really is a work saver for me.
Note that it is easier to kill the `tests/' part of the file names than
to try to build the suite from $(top_srcdir) because then also
package.m4 needs to live there, for example, and that would just be
ugly.
This patch conflicts with a couple of recently posted ones. I don't
care. You should be able to resolve them rather easily. ;-)
We will look at this again as soon as the number of `.at' files blows
some command line lenght limit.
Cheers,
Ralf
* Makefile.am (TESTSUITE_AT): List testsuite files in the order
in which they are to be expanded in the suite.
(tests/TESTSUITE): Rebuild by passing all $(TESTSUITE_AT) files,
with their path suitably adjusted. This enables us to..
* tests/testsuite.at: ..get rid of their redundant mention here.
Index: Makefile.am
===
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.188
diff -u -r1.188 Makefile.am
--- Makefile.am 24 Jan 2006 07:43:48 - 1.188
+++ Makefile.am 31 Jan 2006 07:40:15 -
@@ -379,24 +379,25 @@
## Test suite. ##
## --- ##
+# The testsuite files are evaluated in the order given here.
TESTSUITE = tests/testsuite
TESTSUITE_AT = tests/testsuite.at \
- tests/am-subdir.at \
+ tests/libtoolize.at \
tests/duplicate_members.at \
tests/inherited_flags.at \
- tests/libtoolize.at \
- tests/nonrecursive.at \
+ tests/convenience.at \
+ tests/link-order.at \
+ tests/fail.at \
tests/old-m4-iface.at \
- tests/recursive.at \
+ tests/am-subdir.at \
tests/standalone.at \
- tests/deplibs-ident.at \
- tests/stresstest.at \
tests/subproject.at \
- tests/link-order.at \
- tests/fail.at \
- tests/convenience.at \
+ tests/nonrecursive.at \
+ tests/recursive.at \
+ tests/template.at \
tests/early-libtool.at \
- tests/template.at
+ tests/deplibs-ident.at \
+ tests/stresstest.at
EXTRA_DIST += $(TESTSUITE) $(TESTSUITE_AT) tests/package.m4
@@ -426,8 +427,8 @@
# Use `$(srcdir)' for the benefit of non-GNU makes: this is
# how `testsuite' appears in our dependencies.
$(srcdir)/$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT)
- cd $(srcdir)/tests; \
- $(AUTOTEST) testsuite.at -o testsuite
+ cd $(srcdir)/tests && \
+ $(AUTOTEST) `echo $(TESTSUITE_AT) | sed 's,tests/,,g'` -o testsuite
$(srcdir)/tests/package.m4: $(srcdir)/configure.ac
{ \
Index: tests/testsuite.at
===
RCS file: /cvsroot/libtool/libtool/tests/testsuite.at,v
retrieving revision 1.38
diff -u -r1.38 testsuite.at
--- tests/testsuite.at 30 Jan 2006 20:14:04 - 1.38
+++ tests/testsuite.at 31 Jan 2006 07:38:46 -
@@ -277,36 +277,4 @@
## --- ##
AT_INIT
-
-# libtoolize tests
-m4_include([libtoolize.at])
-# Testing func_extract_archives
-m4_include([duplicate_members.at])
-# Test that inherited_linker_flags in the .la actually gets used.
-m4_include([inherited_flags.at])
-# convenience archives test
-m4_include([convenience.at])
-# link order test
-m4_include([link-order.at])
-# ensure failure
-m4_include([fail.at])
-# Ensure our continued support for old interfaces.
-m4_include([old-m4-iface.at])
-# Torturing subdir-objects builds
-m4_include([am-subdir.at])
-# standalone libltdl compilation
-m4_include([standalone.at])
-# subproject libltdl compilation
-m4_include([subproject.at])
-# nonrecursive libltdl compilation
-m4_include([nonrecursive.at])
-# recursive libltdl compilation
-m4_include([recursive.at])
-# C++ templates tests
-m4_include([template.at])
-# Behaviour of LT_OUTPUT
-m4_include([early-libtool.at])
-# identical deplibs
-m4_include([deplibs-ident.at])
-# stress test
-m4_include([stresstest.at])
+# The other tests will be appended here by the Makefile rule.
