Re: [patch 15/19] 299-gary-refactor-autotests.diff Queue

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Mon, Oct 10, 2005 at 12:26:39PM CEST:
>  tests/old-m4-iface.at |   64 ++++-------------------------------
>  tests/standalone.at   |   80 +------------------------------------------
>  tests/subproject.at   |   85 ----------------------------------------------
>  tests/testsuite.at    |   91 
> ++++++++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 102 insertions(+), 218 deletions(-)

Approved (after its requirements are in, if any), except for one nit,
see below inline.

Oh, if you were bored, you could
  _LTDL_PROJECT_FILES([with-or-without-Makefile])
but really I don't care.

Cheers,
Ralf

*snip part*
> Index: libtool--devo--1.0/tests/standalone.at
> ===================================================================
> --- libtool--devo--1.0.orig/tests/standalone.at
> +++ libtool--devo--1.0/tests/standalone.at
> @@ -73,84 +73,8 @@ AT_CLEANUP
>  
>  AT_SETUP([linking libltdl without autotools])
>  
> -AT_DATA([module.c],
> -[[const char *
> -hello (void)
> -{
> -  return "Hello!";
> -}
> -]])
> -
> -AT_DATA([main.c],
> -[[#include <stdio.h>
> -#include "ltdl.h"
> -
> -int
> -main (int argc, char **argv)
> -{
> -  lt_dlhandle handle;
> -  const char *(*func) (void) = 0;
> -  int status = 1;
> -
> -  LTDL_SET_PRELOADED_SYMBOLS();
> -  if (lt_dlinit() != 0) {
> -    fprintf (stderr, "error during initialisation: %s\n", lt_dlerror());
> -    return 1;
> -  }
> -
> -  handle = lt_dlopen("module.la");
> -  if (!handle) {
> -    fprintf (stderr, "error dlopening module.la: %s\n", lt_dlerror());
> -    goto finish;
> -  }
> -
> -  func = (const char *(*)(void)) lt_dlsym (handle, "hello");
> -  if (!func) {
> -    fprintf (stderr, "error fetching func: %s\n", lt_dlerror());
> -    goto finish;
> -  }
> -
> -  printf ("%s\n", (*func) ());
> -  status = 0;
> -
> -finish:
> -  lt_dlexit();
> -
> -  return status;
> -}
> -]])
> -
> -AT_DATA([Makefile],
> -[[LIBTOOL    = ./libltdl/libtool
> -INCLUDES     = -I./libltdl
> -MODFLAGS     = -module -avoid-version -no-undefined
> -
> -LTCOMPILE = $(LIBTOOL) --tag=CC $(LIBTOOLFLAGS) --mode=compile \
> -        $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
> -LTLINK    = $(LIBTOOL) --tag=CC $(LIBTOOLFLAGS) --mode=link \
> -        $(CC) $(CFLAGS) $(LDFLAGS)
> -
> -TARGETS              = libltdl/libltdlc.la module.la ltdldemo$(EXEEXT)
> -
> -all: $(TARGETS)
> -
> -$(LIBTOOL) libltdl/libltdlc.la:
> -     cd libltdl && ./configure $(CONFIGURE_OPTIONS) && $(MAKE)
> -
> -ltdldemo$(EXEEXT): $(LIBTOOL) module.la libltdl/libltdlc.la main.lo
> -     $(LTLINK) -o ltdldemo main.lo -dlopen module.la ./libltdl/libltdlc.la
> -
> -main.lo: $(LIBTOOL) main.c
> -     $(LTCOMPILE) -c main.c
> -
> -module.la: $(LIBTOOL) module.lo
> -     $(LTLINK) -o module.la module.lo $(MODFLAGS) -rpath /dev/null
> -
> -module.lo: $(LIBTOOL) module.c
> -     $(LTCOMPILE) -c module.c
> -]])
> -
> -LT_AT_LIBTOOLIZE([--copy --ltdl])
> +_LTDL_PROJECT_FILES
> +LT_AT_LIBTOOLIZE([--copy --ltdl=sub/ltdl])

Why did you change `--ltdl' to `--ltdl=sub/ltdl' here?
IMO better to leave as-is, unless there is a compelling reason against
it.  (We have to support plain `--ltdl' for backward compatibility.)

>  LT_AT_MAKE([], [CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \
>          CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
>       CONFIGURE_OPTIONS="$configure_options"])
*snip part*