From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 20 May 2010 21:21:38 +0000 (+0700)
Subject: Skip some tests in --disable-ltdl-install mode.
X-Git-Tag: v2.2.7b~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=066a70fd86af1d88a1070e129b2aff457346de98;p=thirdparty%2Flibtool.git

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 a4e26b66f..d8734bddb 100644
--- 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 a9aa814f7..37c898447 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 920b30e63..6fe9f9ac3 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 65d6b554c..c412d54cf 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 30ebd3a49..e87cb9012 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 ca5bdfa31..26a2b241a 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 c16a72aca..2a852047e 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