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.

diff --git a/ChangeLog b/ChangeLog
index a4e26b66f89c0aef62d06969dec944138964ff8a..d8734bddb45a5af8563653f1ac7d3cf091260c35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-21  Gary V. Vaughan  <gary@gnu.org>
+
+       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  <peda@lysator.liu.se>
 
        Clarify versioning algorithm documentation.

diff --git a/tests/dlloader-api.at b/tests/dlloader-api.at
index a9aa814f7e880cae0a14c575bfde7df9dcf049e6..37c898447b4339ccf8cf0421614e0bd7078934ee 100644 (file)
--- 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 920b30e6316ad8f424084303d20079f83002e2fe..6fe9f9ac31c488c89aa4a054d43ab2d84e2ed04e 100644 (file)
--- 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 65d6b554ca0eaca5b5319a2544e4b5b8a61847e6..c412d54cf20685c5fb2d7b2cca2c5f6a3eec69c6 100644 (file)
--- 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 30ebd3a4921fae08aeda25537e84b33ff4bcf755..e87cb90129cfa2f1f3d23ec9978edae5aeeead42 100644 (file)
--- 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 ca5bdfa31059ac523deb308702edcff96de9a75b..26a2b241ae472b3186bcc63c265eb39388c8c71e 100644 (file)
--- 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 c16a72aca18ed11d7859d118bd703c926330d868..2a852047eb86c79c8970bf51168878ffed69ea4c 100644 (file)
--- 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