On Wednesday 30 March 2011, Ralf Wildenhues wrote: > * Stefano Lattarini wrote on Wed, Mar 30, 2011 at 05:47:44PM CEST: > > So I've seized this opportunity to do some minor refactoring and extending > > in > > the tests for the "maintainer-clean" target. The resulting simple patch > > (for > > maint) is attached. A quick "grep maintainer-clean *.test" should show > > that > > I haven't just duplicated existing checks. > > > > I'll push in 72 hours if there are no objections. > > A general comment: if you keep on adding tests to maint, it will break > branch-1.11 in the long run, in the sense that the branch will not be > releasable any more without splitting up the test suite, or improving > the test suite driver as discussed before, as it will not work any more > on MinGW/MSYS. Please keep this in mind. > How much room is left, approximately? I have no big problems in applying this patch to master only, but I'd rather keep it in maint unless we are already dangerously near to the MinGW/MSYS upper limit.
> (Same holds for master, of course, but that train's already left so > there is no need to hold back ...) > > Patch is otherwise ok, with a really minor nit below. > > Thanks, > Ralf > > > Subject: [PATCH] tests: improve tests on "maintainer-clean" target > > > > * tests/aclocal6.test: Move checks related to "maintainer-clean" > > functionalities into ... > > * tests/maintclean-vpath.test: ... this new test. > > * tests/maintclean.test: Update heading comments. Extend to also > > test subdirs. Remove useless disabling of YACC. Fix m4 quoting > > in configure.in. Add a trailing `:' command. > > * tests/Makefile.am (TESTS): Update. > > > --- /dev/null > > +++ b/tests/maintclean-vpath.test > > > +# Make sure distclean and maintainer-clean erase the right files. > > +# This test is for VPATH builds; see sister test `maintclean-vpath.test' > > +# for in-tree builds. > > + > > +. ./defs || Exit 1 > > + > > +set -e > > + > > +cat >> configure.in << 'END' > > +AC_CONFIG_FILES([bar sub/Makefile]) > > +AC_OUTPUT > > +END > > + > > +cat > Makefile.am <<'END' > > + > > +SUBDIRS = sub > > + > > +noinst_DATA = foo.c > > + > > +foo.c: > > + touch foo.c > > + > > +MAINTAINERCLEANFILES = foo.c > > + > > +END > > Can we compactify vertically a bit here? > > SUBDIRS = sub > noinst_DATA = foo.c > MAINTAINERCLEANFILES = foo.c > > foo.c: > touch foo.c > > or some other reasonable way that doesn't just introduce an empty line > at every possible place for no other reason? Similarly in the other > test. > Well, in fact I had originally compactified this (in maintclean.test), but then I thought you would object to the related "diff noise", so I chose to minimize the "cosmetic" changes, and I reverted that part of the patch. Then I kept the extra spaces in maintclean-vpath.test too, since it is a sister test of maintclean.test, and I aim at minimizing the diffs between sister tests. Anyway, I'll be more than happy at compactifying things here, now that I know you are ok with that. See the attached squash-in, which I'll push shortly (by tomorrow) barring new objections. Thanks, Stefano
diff --git a/ChangeLog b/ChangeLog index 972f4f6..0c2d416 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,8 @@ * tests/maintclean-vpath.test: ... this new test. * tests/maintclean.test: Update heading comments. Extend to also test subdirs. Remove useless disabling of YACC. Fix m4 quoting - in configure.in. Add a trailing `:' command. + in configure.in. Add a trailing `:' command. Remove extra blank + lines. * tests/Makefile.am (TESTS): Update. 2011-03-21 Ralf Wildenhues <ralf.wildenh...@gmx.de> diff --git a/tests/maintclean-vpath.test b/tests/maintclean-vpath.test index 8b622bc..8dd2a95 100755 --- a/tests/maintclean-vpath.test +++ b/tests/maintclean-vpath.test @@ -28,28 +28,19 @@ AC_OUTPUT END cat > Makefile.am <<'END' - SUBDIRS = sub - noinst_DATA = foo.c - foo.c: touch foo.c - MAINTAINERCLEANFILES = foo.c - END mkdir sub cat > sub/Makefile.am <<'END' - noinst_SCRIPTS = zap - zap: zap.sh cp $(srcdir)/zap.sh $@ && chmod a+x $@ - MAINTAINERCLEANFILES = zap - END : > bar.in diff --git a/tests/maintclean.test b/tests/maintclean.test index 6503864..9e22463 100755 --- a/tests/maintclean.test +++ b/tests/maintclean.test @@ -28,28 +28,19 @@ AC_OUTPUT END cat > Makefile.am <<'END' - SUBDIRS = sub - noinst_DATA = foo.c - foo.c: touch foo.c - MAINTAINERCLEANFILES = foo.c - END mkdir sub cat > sub/Makefile.am <<'END' - noinst_SCRIPTS = zap - zap: zap.sh cp $(srcdir)/zap.sh $@ && chmod a+x $@ - MAINTAINERCLEANFILES = zap - END : > bar.in