Re: [patch 18/19] 300-gary-simplify-tests.diff Queue

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Oct 10, 2005 at 12:26:42PM CEST:
>  tests/old-m4-iface.at |    7 +++----
>  tests/subproject.at   |   12 +++---------
>  tests/testsuite.at    |    6 +++---
>  3 files changed, 9 insertions(+), 16 deletions(-)
> 
> Index: libtool--devo--1.0/ChangeLog
> from  Gary V. Vaughan  <address@hidden>
>       * tests/testsuite.at (LT_AT_BOOTSTRAP): Allow passing arguments to
>       configure.
>       * tests/old-m4-iface.at, tests/subproject.at: Use LT_AT_BOOTSTRAP./

Why not rather
  LT_AT_BOOTSTRAP([LIBTOOLIZE-ARGS], [AUTORECONF-ARGS], [CONFIGURE-ARGS])
?  If you agree, please go ahead and commit a change to that extent.
Rationale: I would like some tests to not have `--force', for example;
also `--ltdl' would be necessary as per my other reject.

The old-m4-iface.at change is fine.  If you're bored, you could also
fix Makefile.am, testsuite.at to point $macrodir to the installed
directory for `installcheck'..

Cheers,
Ralf


> Index: libtool--devo--1.0/tests/old-m4-iface.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/old-m4-iface.at
> +++ libtool--devo--1.0/tests/old-m4-iface.at
> @@ -71,10 +71,9 @@ LT_AT_LIBTOOLIZE([--install])
>  
>  # This is slightly bogus, since only libtool.m4 was required in aclocal.m4
>  # with libtool-1.5x...
> -test -f aclocal.m4 \
> -    || cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
> -     "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4 \
> -    || exit 1
> +AT_CHECK([test -f aclocal.m4 ||
> +  cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
> +      "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4])
>  
>  LT_AT_AUTOCONF([--force])
>  LT_AT_CONFIGURE
> Index: libtool--devo--1.0/tests/subproject.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/subproject.at
> +++ libtool--devo--1.0/tests/subproject.at
> @@ -51,9 +51,7 @@ touch foo.c
>  AT_SETUP([compiling softlinked libltdl])
>  
>  _LTDL_SETUP
> -LT_AT_LIBTOOLIZE([--ltdl])
> -LT_AT_AUTORECONF([--force --verbose --install])
> -LT_AT_CONFIGURE
> +LT_AT_BOOTSTRAP
>  LT_AT_MAKE
>  
>  AT_CHECK([test -f sub/ltdl/libltdlc.la])
> @@ -68,9 +66,7 @@ AT_CLEANUP
>  AT_SETUP([compiling copied libltdl])
>  
>  _LTDL_SETUP
> -LT_AT_LIBTOOLIZE([--copy --ltdl])
> -LT_AT_AUTORECONF([--force --verbose --install])
> -LT_AT_CONFIGURE
> +LT_AT_BOOTSTRAP
>  LT_AT_MAKE
>  
>  AT_CHECK([test -f sub/ltdl/libltdlc.la])
> @@ -87,9 +83,7 @@ AT_SETUP([installable libltdl])
>  prefix=`pwd`/_inst
>  
>  _LTDL_SETUP
> -LT_AT_LIBTOOLIZE([--copy --ltdl])
> -LT_AT_AUTORECONF([--force --verbose --install])
> -LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
> +LT_AT_BOOTSTRAP([--enable-ltdl-install --prefix=$prefix])
>  LT_AT_MAKE([all install])
>  
>  AT_CHECK([test -f $prefix/lib/libltdl.la])
> Index: libtool--devo--1.0/tests/testsuite.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/testsuite.at
> +++ libtool--devo--1.0/tests/testsuite.at
> @@ -91,12 +91,12 @@ m4_define([LT_AT_MAKE],
>  ])
>  
>  
> -# LT_AT_BOOTSTRAP
> -# ---------------
> +# LT_AT_BOOTSTRAP([CONFIGURE-ARGS])
> +# ---------------------------------
>  m4_define([LT_AT_BOOTSTRAP],
>  [LT_AT_LIBTOOLIZE([--copy])
>  LT_AT_AUTORECONF([--force --verbose --install])
> -LT_AT_CONFIGURE
> +LT_AT_CONFIGURE([$1])
>  ])