* tests/testsuite.at (LT_AT_NOINST_EXEC_CHECK): New macro, like

LT_AT_EXEC_CHECK but uses `$LIBTOOL --mode=execute' and allows
to pass `-dlopen MODULE' arguments.
* tests/lt_dlexit.at: Use it.  Also, do not test `-dlpreopen',
that currently needs library names to begin with `lib'.

diff --git a/ChangeLog b/ChangeLog
index 90ac70401962c46215f4e38aa7e546ef33f01d85..98806ea919edd09f9da486b2cac7cac5bb90051f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * tests/testsuite.at (LT_AT_NOINST_EXEC_CHECK): New macro, like
+       LT_AT_EXEC_CHECK but uses `$LIBTOOL --mode=execute' and allows
+       to pass `-dlopen MODULE' arguments.
+       * tests/lt_dlexit.at: Use it.  Also, do not test `-dlpreopen',
+       that currently needs library names to begin with `lib'.
+
 2007-02-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * tests/export.at: New test: expose -export-symbols failure

diff --git a/tests/lt_dlexit.at b/tests/lt_dlexit.at
index a5be7c5ee14e777dd3e1f296338b36da9c0f37ae..7cd51118e74a07ae981a01b7b0f5275aeda7ad46 100644 (file)
--- a/tests/lt_dlexit.at
+++ b/tests/lt_dlexit.at
@@ -129,10 +129,11 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba1.la a1.lo \
 AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o modb1.la b1.lo \
           -rpath /foo -module -avoid-version liba1.la], [], [ignore], [ignore])
 
-for dlopen in -dlopen -dlpreopen; do
+# TODO: test -dlpreopen
+for dlopen in -dlopen; do
   AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT \
            $dlopen modb1.la $LIBLTDL], [], [ignore], [ignore])
-  LT_AT_EXEC_CHECK([./main])
+  LT_AT_NOINST_EXEC_CHECK([./main], [-dlopen modb1.la])
 done
 
 AT_CLEANUP

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 406030a48f5fc8b09c264ce385974fc22311bda5..37e83b4e69bcd648ada038400e8e5095adf4c22e 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -165,6 +165,18 @@ m4_define([LT_AT_EXEC_CHECK],
 ])
 
 
+# LT_AT_NOINST_EXEC_CHECK(EXECUTABLE, [NOINST-MODULES],
+#                        [STATUS = 0], [STDOUT], [STDERR])
+# ---------------------------------------------------------
+m4_define([LT_AT_NOINST_EXEC_CHECK],
+[AT_CHECK([$LIBTOOL --mode=execute $2 $1; lt_status=$?;
+          if test $lt_status -eq 0; then :;
+          elif test "X$host" != "X$build" && \
+               { test -x "$1" || test -x "$1"$EXEEXT; }
+          then (exit 77); else (exit $lt_status); fi],[$3],[$4],[$5])
+])
+
+
 # LT_AT_TAG(TAG)
 # --------------
 m4_define([LT_AT_TAG],