libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Ralf Wildenhues
Subject: Re: [patch 18/19] 300-gary-simplify-tests.diff
Date: Thu, 10 Nov 2005 15:28:08 +0100
User-agent: Mutt/1.5.11

Hi Gary,

* Gary V. Vaughan wrote on Tue, Oct 18, 2005 at 11:15:20AM CEST:
> Redone against current HEAD + previous patches & feedback.  Okay to commit?

Yes, modulo nits below.  Thanks.

Cheers,
Ralf

> 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./
> 
> Index: libtool--devo--1.0/tests/am-subdir.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/am-subdir.at
> +++ libtool--devo--1.0/tests/am-subdir.at
> @@ -31,6 +31,7 @@ AT_DATA([[configure.ac]],
>  [[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
>  AM_INIT_AUTOMAKE([subdir-objects foreign])
>  LT_INIT([win32-dll])
> +AC_PROG_CC
>  AM_PROG_CC_C_O
>  AC_CONFIG_FILES([Makefile])
>  AC_OUTPUT
> @@ -73,8 +74,8 @@ AT_DATA(expout,
>  ** This is libsub **
>  ]])
>  
> -LT_AT_BOOTSTRAP
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([--copy --ltdl], [], [ignore], [--add-missing])

Remove the --ltdl here. am-subdir test has nothing to do with libltdl.
Please make sure that when you install 308 (which touches the same
line), you don't undo that change again.

> +
>  LT_AT_EXEC_CHECK([subdir/subdemo], 0, expout)
>  
>  AT_CLEANUP
> @@ -91,6 +92,7 @@ LT_AT_TAG([CXX])
>  AT_DATA([[configure.ac]],
>  [[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[)
>  AM_INIT_AUTOMAKE([subdir-objects foreign])
> +AC_PROG_CC
>  AM_PROG_CC_C_O
>  AC_PROG_CXX
>  AC_PROG_CXXCPP
> @@ -148,8 +150,8 @@ AT_DATA([[subdir/sub.cxx]],
>  int libsub::sub (void) { return 27; }
>  ]])
>  
> -LT_AT_BOOTSTRAP
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([--copy --ltdl], [], [ignore], [--add-missing])

Ditto.

> +
>  LT_AT_EXEC_CHECK([subdir/subdemo], 0)
>  
>  AT_CLEANUP
> Index: libtool--devo--1.0/tests/nonrecursive.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/nonrecursive.at
> +++ libtool--devo--1.0/tests/nonrecursive.at
> @@ -76,13 +76,7 @@ for file in argz.c lt__dirent.c lt__strl
>    cp libltdl/$file $file
>  done
>  
> -LT_AT_ACLOCAL([-I libltdl/m4])
> -LT_AT_AUTOHEADER
> -LT_AT_AUTOMAKE([--add-missing --copy])
> -LT_AT_AUTOCONF
> -
> -LT_AT_CONFIGURE
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [], [--add-missing --copy])

Please put `ignore' for the autoheader position here.
Otherwise, the test fails (my missing fixup, see other mail).

>  
>  AT_CHECK([test -f libltdl/libltdlc.la])
>  
> @@ -105,13 +99,7 @@ for file in argz.c lt__dirent.c lt__strl
>    cp libltdl/$file $file
>  done
>  
> -LT_AT_ACLOCAL([-I libltdl/m4])
> -LT_AT_AUTOHEADER
> -LT_AT_AUTOMAKE([--add-missing --copy])
> -LT_AT_AUTOCONF
> -
> -LT_AT_CONFIGURE
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [], [--add-missing --copy])

Ditto.

>  
>  AT_CHECK([test -f libltdl/libltdlc.la])
>  
> @@ -136,13 +124,8 @@ for file in argz.c lt__dirent.c lt__strl
>    cp libltdl/$file $file
>  done
>  
> -LT_AT_ACLOCAL([-I libltdl/m4])
> -LT_AT_AUTOHEADER
> -LT_AT_AUTOMAKE([--add-missing --copy])
> -LT_AT_AUTOCONF
> -
> -LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
> -LT_AT_MAKE([all install])
> +LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [], [--add-missing --copy], [],
> +     [--enable-ltdl-install --prefix=$prefix], [all install])

Ditto.

>  
>  AT_CHECK([test -f $prefix/lib/libltdl.la])
>  AT_CHECK([test -f $prefix/include/ltdl.h])
> 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,14 +71,11 @@ 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
> -
> -LT_AT_AUTOCONF([--force])
> -LT_AT_CONFIGURE
> -LT_AT_MAKE
> +AT_CHECK([test -f aclocal.m4 ||
> +  cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \
> +      "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4])
> +
> +LT_AT_BOOTSTRAP([ignore], [ignore], [ignore], [ignore], [--force])
>  
>  LT_AT_EXEC_CHECK([./old], 0, [Hello, World!])
>  
> @@ -133,11 +130,8 @@ address@hidden@: address@hidden@
>       $(LTCOMPILE) -c -o $@ $<
>  ]])
>  
> -LT_AT_LIBTOOLIZE([--ltdl --install])
> -LT_AT_ACLOCAL([-I libltdl/m4])
> -LT_AT_AUTOCONF([--force])
> -LT_AT_CONFIGURE
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([--ltdl --install], [-I libltdl/m4], [ignore], [ignore],
> +     [--force])
>  
>  LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
>  
> Index: libtool--devo--1.0/tests/subproject.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/subproject.at
> +++ libtool--devo--1.0/tests/subproject.at
> @@ -52,13 +52,7 @@ AT_SETUP([compiling softlinked libltdl])
>  
>  _LTDL_SETUP
>  
> -LT_AT_LIBTOOLIZE([--ltdl])
> -LT_AT_ACLOCAL([-I sub/ltdl/m4])
> -LT_AT_AUTOMAKE([--add-missing --copy])
> -LT_AT_AUTOCONF
> -
> -LT_AT_CONFIGURE
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([--ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy])
>  
>  AT_CHECK([test -f sub/ltdl/libltdlc.la])
>  
> @@ -73,13 +67,8 @@ AT_SETUP([compiling copied libltdl])
>  
>  _LTDL_SETUP
>  
> -LT_AT_LIBTOOLIZE([--copy --ltdl])
> -LT_AT_ACLOCAL([-I sub/ltdl/m4])
> -LT_AT_AUTOMAKE([--add-missing --copy])
> -LT_AT_AUTOCONF
> -
> -LT_AT_CONFIGURE
> -LT_AT_MAKE
> +LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
> +     [--add-missing --copy])
>  
>  AT_CHECK([test -f sub/ltdl/libltdlc.la])
>  
> @@ -96,13 +85,9 @@ prefix=`pwd`/_inst
>  
>  _LTDL_SETUP
>  
> -LT_AT_LIBTOOLIZE([--copy --ltdl])
> -LT_AT_ACLOCAL([-I sub/ltdl/m4])
> -LT_AT_AUTOMAKE([--add-missing --copy])
> -LT_AT_AUTOCONF
> -
> -LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
> -LT_AT_MAKE([all install])
> +LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore],
> +     [--add-missing --copy], [], [--enable-ltdl-install --prefix=$prefix],
> +     [all install])
>  
>  AT_CHECK([test -f $prefix/lib/libltdl.la])
>  AT_CHECK([test -f $prefix/include/ltdl.h])
> Index: libtool--devo--1.0/tests/testsuite.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/testsuite.at
> +++ libtool--devo--1.0/tests/testsuite.at
> @@ -105,12 +105,17 @@ m4_define([LT_AT_MAKE],
>  ])
>  
>  
> -# LT_AT_BOOTSTRAP
> -# ---------------
> +# LT_AT_BOOTSTRAP([LIBTOOLIZE-ARGS], [ACLOCAL-ARGS], [AUTOHEADER-ARGS],
> +#    [AUTOMAKE-ARGS], [AUTOCONF-ARGS], [CONFIGURE-ARGS], [MAKE-ARGS])
> +# ----------------------------------------------------------------------
>  m4_define([LT_AT_BOOTSTRAP],
> -[LT_AT_LIBTOOLIZE([--copy])
> -LT_AT_AUTORECONF([--force --verbose --install])
> -LT_AT_CONFIGURE
> +[m4_if([$1], [ignore], [], [LT_AT_LIBTOOLIZE([$1])])
> +m4_if([$2], [ignore], [], [LT_AT_ACLOCAL([$2])])
> +m4_if([$3], [ignore], [], [LT_AT_AUTOHEADER([$3])])
> +m4_if([$4], [ignore], [], [LT_AT_AUTOMAKE([$4])])
> +m4_if([$5], [ignore], [], [LT_AT_AUTOCONF([$5])])
> +m4_if([$6], [ignore], [], [LT_AT_CONFIGURE([$6])])
> +m4_if([$7], [ignore], [], [LT_AT_MAKE([$7])])
>  ])




reply via email to

[Prev in Thread] Current Thread [Next in Thread]