/floppy/m4-patches/16-fyi-autotest-clean.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * tests/Makefile.am (CLEANFILES): Remove.
        (DISTCLEANFILES, clean-local): New.
        * examples/mktests.sh: Remove.

Index: examples/Makefile.am
--- examples/Makefile.am Fri, 24 Aug 2001 17:11:45 +0200 akim
+++ examples/Makefile.am Fri, 24 Aug 2001 17:40:04 +0200 akim
@@ -1,5 +1,5 @@
 ## This file is part of GNU m4
-## Copyright 2000 Free Software Foundation, Inc.
+## Copyright 2000, 2001 Free Software Foundation, Inc.
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA

-EXTRA_DIST = mktests.sh $(WEB_SITE)
+EXTRA_DIST = $(WEB_SITE)

 MAINTAINERCLEANFILES = Makefile.in

Index: tests/Makefile.am
--- tests/Makefile.am Fri, 24 Aug 2001 17:11:45 +0200 akim
+++ tests/Makefile.am Fri, 24 Aug 2001 17:38:57 +0200 akim
@@ -22,6 +22,7 @@
 EXTRA_DIST = generate.awk atlocal.in \
        $(OTHER_FILES) $(TESTSUITE_AT) $(TESTSUITE)

+DISTCLEANFILES       = atconfig atlocal
 MAINTAINERCLEANFILES = Makefile.in generated.at $(TESTSUITE)

 OTHER_FILES = \
@@ -34,6 +35,9 @@
 check-local: atconfig $(TESTSUITE)
        $(SHELL) $(srcdir)/$(TESTSUITE)

+clean-local:
+       $(srcdir)/testsuite --clean
+
 $(srcdir)/generated.at: $(srcdir)/generate.awk $(top_srcdir)/doc/m4.texinfo
        rm -f $@ address@hidden
        $(AWK) -f $(srcdir)/generate.awk $(top_srcdir)/doc/m4.texinfo 
>address@hidden
@@ -47,6 +51,3 @@ check-local: atconfig $(TESTSUITE)
        $(AUTOTEST) -I $(srcdir) testsuite.at -o address@hidden
        chmod +x address@hidden
        mv address@hidden $@
-
-# Junk created by the testsuite.
-CLEANFILES = at-* atconfig atlocal frozen.m4f testsuite.log
Index: examples/mktests.sh
--- examples/mktests.sh Thu, 18 Feb 1999 08:42:42 +0100 demaille
+++ examples/mktests.sh Fri, 24 Aug 2001 17:47:54 +0200 akim
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-: ${M4:=../../src/m4}
-
-test $# -eq 1 || exit 1
-FILE=`basename $1 .m4`
-
-
-test -r $FILE.m4 || exit 1
-
-if head -1 $FILE.m4 | fgrep -w 'dnl noauto' >/dev/null; then
-    echo "$FILE.test cannot be generated" 1>&2
-    exit 1
-fi
-
-test -d testSubDir || mkdir testSubDir
-
-cat "$FILE.m4" > testSubDir/in
-(cd testSubDir; $M4 -I.. -d "in" >out 2>err)
-
-(
-
-cat <<EOFEOF
-#!/bin/sh
-
-# $FILE.test is part of the GNU m4 testsuite
-
-. \${srcdir}/defs
-
-cat \${srcdir}/$FILE.m4 >in
-EOFEOF
-
-echo
-echo 'cat <<\EOF >ok'
-cat testSubDir/out
-echo EOF
-
-if [ -s testSubDir/err ]; then
-    echo
-    echo 'cat <<\EOF >okerr'
-    sed -e "s,$M4: ,m4: ," testSubDir/err
-    echo EOF
-fi
-
-echo
-echo 'M4PATH=$srcdir:$srcdir/../tests $M4 -d in >out 2>err'
-echo 'sed -e "s,../../src/m4: ,m4: ," err >sederr && mv sederr err'
-
-if [ -s testSubDir/err ]; then
-    echo '$CMP -s out ok && $CMP -s err okerr'
-else
-    echo '$CMP -s out ok'
-fi
-) >$FILE.test.new
-
-if cmp -s $FILE.test.new $FILE.test; then
-    echo "$FILE.test unchanged" 1>&2
-    rm -f $FILE.test.new
-else
-    echo "creating $FILE.test" 1>&2
-    mv $FILE.test.new $FILE.test
-    chmod +x $FILE.test
-fi
-
-rm -f testSubDir/out testSubDir/err