From 066a70fd86af1d88a1070e129b2aff457346de98 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 21 May 2010 04:21:38 +0700 Subject: [PATCH] Skip some tests in --disable-ltdl-install mode. * tests/dlloader-api.at, tests/exceptions.at, tests/lalib-syntax.at, tests/loadlibrary.at, tests/lt_dlopenext.at, tests/resident.at: Detect when these tests try to link against the not installed libltdl.la, and skip rather than FAIL. --- ChangeLog | 9 +++++++++ tests/dlloader-api.at | 6 ++++++ tests/exceptions.at | 8 ++++++++ tests/lalib-syntax.at | 7 +++++++ tests/loadlibrary.at | 6 ++++++ tests/lt_dlopenext.at | 6 ++++++ tests/resident.at | 6 ++++++ 7 files changed, 48 insertions(+) diff --git a/ChangeLog b/ChangeLog index a4e26b66..d8734bdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-05-21 Gary V. Vaughan + + Skip some tests in --disable-ltdl-install mode. + * tests/dlloader-api.at, tests/exceptions.at, + tests/lalib-syntax.at, tests/loadlibrary.at, + tests/lt_dlopenext.at, tests/resident.at: Detect when these + tests try to link against the not installed libltdl.la, and + skip rather than FAIL. + 2010-05-05 Peter Rosin Clarify versioning algorithm documentation. diff --git a/tests/dlloader-api.at b/tests/dlloader-api.at index a9aa814f..37c89844 100644 --- a/tests/dlloader-api.at +++ b/tests/dlloader-api.at @@ -395,6 +395,12 @@ last_exit: last_ctx : ${LTDLINCL="-I$abs_top_srcdir/libltdl"} : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} +# Skip this test when called from: +# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install +AT_CHECK([case $LIBLTDL in #( + */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; +esac], [], [ignore]) + CPPFLAGS="$LTDLINCL $CPPFLAGS" AT_CHECK([$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c module.c], diff --git a/tests/exceptions.at b/tests/exceptions.at index 920b30e6..6fe9f9ac 100644 --- a/tests/exceptions.at +++ b/tests/exceptions.at @@ -24,8 +24,16 @@ AT_SETUP([C++ exception handling]) AT_KEYWORDS([libtool]) AT_KEYWORDS([libltdl]) + : ${LTDLINCL="-I$abs_top_srcdir/libltdl"} : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} + +# Skip this test when called from: +# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install +AT_CHECK([case $LIBLTDL in #( + */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; +esac], [], [ignore]) + CPPFLAGS="$LTDLINCL $CPPFLAGS" AT_DATA([module.h], diff --git a/tests/lalib-syntax.at b/tests/lalib-syntax.at index 65d6b554..c412d54c 100644 --- a/tests/lalib-syntax.at +++ b/tests/lalib-syntax.at @@ -64,6 +64,13 @@ AT_DATA([module.c], : ${LTDLINCL="-I$abs_top_srcdir/libltdl"} : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} + +# Skip this test when called from: +# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install +AT_CHECK([case $LIBLTDL in #( + */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; +esac], [], [ignore]) + CPPFLAGS="$CPPFLAGS $LTDLINCL" AT_CHECK([$CC $CPPFLAGS $CFLAGS -c main.c], [], [ignore], [ignore]) diff --git a/tests/loadlibrary.at b/tests/loadlibrary.at index 30ebd3a4..e87cb901 100644 --- a/tests/loadlibrary.at +++ b/tests/loadlibrary.at @@ -212,6 +212,12 @@ barsym (void) : ${LTDLINCL="-I$abs_top_srcdir/libltdl"} : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} +# Skip this test when called from: +# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install +AT_CHECK([case $LIBLTDL in #( + */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; +esac], [], [ignore]) + CPPFLAGS="$LTDLINCL $CPPFLAGS" inst=`pwd`/inst libdir=$inst/lib diff --git a/tests/lt_dlopenext.at b/tests/lt_dlopenext.at index ca5bdfa3..26a2b241 100644 --- a/tests/lt_dlopenext.at +++ b/tests/lt_dlopenext.at @@ -183,6 +183,12 @@ dlerrordup (char *errormsg) : ${LTDLINCL="-I$abs_top_srcdir/libltdl"} : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} +# Skip this test when called from: +# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install +AT_CHECK([case $LIBLTDL in #( + */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; +esac], [], [ignore]) + CPPFLAGS="$LTDLINCL $CPPFLAGS" LDFLAGS="$LDFLAGS -no-undefined" diff --git a/tests/resident.at b/tests/resident.at index c16a72ac..2a852047 100644 --- a/tests/resident.at +++ b/tests/resident.at @@ -121,6 +121,12 @@ setup_plugin (void) : ${LTDLINCL="-I$abs_top_srcdir/libltdl"} : ${LIBLTDL="$abs_builddir/../libltdl/libltdlc.la"} +# Skip this test when called from: +# make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install +AT_CHECK([case $LIBLTDL in #( + */_inst/lib/*) test -f $LIBLTDL || (exit 77) ;; +esac], [], [ignore]) + CPPFLAGS="$LTDLINCL $CPPFLAGS" LDFLAGS="$LDFLAGS -no-undefined" inst=`pwd`/inst