* lib/autotest/general.m4 (AT_INIT): Output the definition of

at_data_files earlier.
(--clean, -c): New option.
* tests/Makefile.am: Use this option.

diff --git a/ChangeLog b/ChangeLog
index b738ebf4ebe15b6b6d9f3474a4b107219c2f2d80..6a08bde5c650815e20a5f1aff3f91637082fe08b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-27  Akim Demaille  <akim@epita.fr>
+
+       * lib/autotest/general.m4 (AT_INIT): Output the definition of
+       at_data_files earlier.
+       (--clean, -c): New option.
+       * tests/Makefile.am: Use this option.
+
+       
 2001-08-27  Akim Demaille  <akim@epita.fr>
 
        * lib/autoconf/status.m4 (_AC_SRCPATHS): Rename `ac_dots' as

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index a42d80051fc7b683b8a035db79d8b736e50ee221..1d6349cce76bc2a8b19926a0f99ad34d70f6c2d3 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -131,6 +131,9 @@ while test $[@%:@] -gt 0; do
   case $[1] in
     --help | -h) at_help=: ;;
     --version) echo "$as_me ($at_package) $at_version"; exit 0 ;;
+    --clean | -c )
+        rm -rf $at_data_files debug-*.sh $as_me.log
+       exit 0;;
 
     -d) at_debug=:;;
     -e) at_stop_on_error=:;;
@@ -158,6 +161,7 @@ Run all the tests, or the selected TESTS.
 
 Options:
   -h  Display this help message and the description of TESTS
+  -c  Remove all the files this test suite might create and exit
   -e  Abort the full suite and inhibit normal clean up if a test fails
   -v  Force more detailed output, default for debugging scripts
   -d  Inhibit clean up and debug script creation, default for debugging scripts
@@ -401,9 +405,8 @@ exit 0
 m4_divert_pop([TAIL])dnl
 m4_wrap([m4_divert_text([DEFAULT],
                         [# List of the tests.
-at_tests_all="AT_TESTS_ALL "])])dnl
-m4_wrap([m4_divert_text([SETUP],
-                        [# List of the output files.
+at_tests_all="AT_TESTS_ALL "
+# List of the output files.
 at_data_files="AT_data_files "])])dnl
 ])# AT_INIT
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index de946e76e96c294ce7a7e8f9301460d497069749..26758a8aa5904b16af190efd4511611d6f83accc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -78,16 +78,7 @@ MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4 \
 $(SUITE_GENERATED): mktests.sh $(MACRO_FILES)
        cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
 
-CLEANFILES =                           \
-       debug-*.sh state-* at-* stderr stdout \
-       script.s4g script.as script                     \
-       configure configure.in configure.ac config.status config.cache \
-       config.log config.h.in config.hin config.h \
-       config.guess config.sub install-sh      \
-       expr                                    \
-       libtool ltconfig ltmain.sh
-
-DISTCLEANFILES = atconfig atlocal testsuite testsuite.log
+DISTCLEANFILES = atconfig atlocal testsuite
 
 
 ## ------------------ ##
@@ -99,6 +90,7 @@ DISTCLEANFILES = atconfig atlocal testsuite testsuite.log
 maintainer-check: maintainer-check-posix maintainer-check-c++
 
 # The hairy heredoc is more robust than using echo.
+CLEANFILES = expr
 expr:
        echo '#! $(SHELL)'            >expr
        echo 'result=`@EXPR@ "$$@"`' >>expr
@@ -119,4 +111,5 @@ maintainer-check-c++:
        CC=g++ make check
 
 clean-local:
-       -rm -rf autom4te.cache builddir inner
+       ./testsuite --clean
+       -rm -rf autom4te.cache

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5f63b5e65810a2a720aee670ba58281633a68969..c727218dba2fd3e1ae0a7d4a011e1f5e416db107 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -111,17 +111,10 @@ MACRO_FILES = $(top_srcdir)/lib/autoconf/general.m4 \
               $(top_srcdir)/lib/autoconf/programs.m4
 
 
-CLEANFILES = \
-       debug-*.sh state-* at-* stderr stdout \
-       script.s4g script.as script                     \
-       configure configure.in configure.ac config.status config.cache \
-       config.log config.h.in config.hin config.h \
-       config.guess config.sub install-sh      \
-       expr                                    \
-       libtool ltconfig ltmain.sh
+DISTCLEANFILES = atconfig atlocal testsuite
 
-
-DISTCLEANFILES = atconfig atlocal testsuite testsuite.log
+# The hairy heredoc is more robust than using echo.
+CLEANFILES = expr
 subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
@@ -258,8 +251,6 @@ $(SUITE_GENERATED): mktests.sh $(MACRO_FILES)
        cd $(srcdir) && ./mktests.sh $(MACRO_FILES)
 
 maintainer-check: maintainer-check-posix maintainer-check-c++
-
-# The hairy heredoc is more robust than using echo.
 expr:
        echo '#! $(SHELL)'            >expr
        echo 'result=`@EXPR@ "$$@"`' >>expr
@@ -280,7 +271,8 @@ maintainer-check-c++:
        CC=g++ make check
 
 clean-local:
-       -rm -rf autom4te.cache builddir inner
+       ./testsuite --clean
+       -rm -rf autom4te.cache
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: