55-fyi-testsuite--clean.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * lib/autotest/general.m4 (AT_INIT): Output the definition of
        at_data_files earlier.
        (--clean, -c): New option.
        * tests/Makefile.am: Use this option.
        
        
Index: lib/autotest/general.m4
--- lib/autotest/general.m4 Fri, 24 Aug 2001 09:53:17 +0200 akim
+++ lib/autotest/general.m4 Fri, 24 Aug 2001 17:18:50 +0200 akim
@@ -131,6 +131,9 @@ m4_define([AT_data_files], [stdout expou
   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 @@ Usage: $[0] [[OPTION]]... [[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 @@ Tests:
 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
 
Index: tests/Makefile.am
--- tests/Makefile.am Fri, 24 Aug 2001 09:22:50 +0200 akim
+++ tests/Makefile.am Fri, 24 Aug 2001 17:19:52 +0200 akim
@@ -78,16 +78,7 @@ testsuite: $(top_srcdir)/lib/m4sugar/m4s
 $(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 @@ testsuite: $(top_srcdir)/lib/m4sugar/m4s
 maintainer-check: maintainer-check-posix maintainer-check-c++
 
 # The hairy heredoc is more robust than using echo.
+CLEANFILES = expr
 expr:
        echo '#! $(SHELL)'            >expr
        echo 'address@hidden@ "$$@"`' >>expr
@@ -119,4 +111,5 @@ maintainer-check-posix: expr
        CC=g++ make check
 
 clean-local:
-       -rm -rf autom4te.cache builddir inner
+       ./testsuite --clean
+       -rm -rf autom4te.cache