* 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.

diff --git a/ChangeLog b/ChangeLog
index f92fd036e4651df2864543223e0f19fc9567cca6..00cca86761ab8a1e869203ba014b57835bc507c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * 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.
+
 2006-01-30  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/libtool.texi (titlepage): Remove superfluous word.

diff --git a/Makefile.am b/Makefile.am
index c4798d667b3e735ebf4457c99678b6474002fe4a..3ee92e40f8250433dc96f4db9a92a8846ecb9783 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -379,24 +379,25 @@ dist-hook:
 ## 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 @@ check-recursive: $(srcdir)/$(TESTSUITE)
 # 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
        { \

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 8d39766020b7be36260543e6da544ebbe396a882..f8fbec9d614b6b12977bda0867dc90cf3f34eee9 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -277,36 +277,4 @@ dnl AT_TESTED([grep autoreconf autom4te automake])
 ## ----------- ##
 
 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.