[SCM] GNU Libtool branch, master, updated. v2.2.6-52-g9abc962

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  9abc9628e03d332868eaea96fb83fc5c5eef77ca (commit)
      from  df2960ac0b8bf43d11acec2144d2e5495019e5ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9abc9628e03d332868eaea96fb83fc5c5eef77ca
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 23 22:54:35 2008 +0100

    Relax link-order2 test for systems with partial wrong order.
    
    * tests/link-order2.at (Link order of deplibs.): On w32 (and
    others, e.g., AIX), the wrongly linked executable picks up only
    one instance of the bad function instead of two; relax the test
    to accept this; we still require the right link order with the
    correctly linked executable.
    Reported by Roumen Petrov and others.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |   10 ++++++++++
 tests/link-order2.at |    6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9a39c79..dc260dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-23  Ralf Wildenhues  <address@hidden>
+
+       Relax link-order2 test for systems with partial wrong order.
+       * tests/link-order2.at (Link order of deplibs.): On w32 (and
+       others, e.g., AIX), the wrongly linked executable picks up only
+       one instance of the bad function instead of two; relax the test
+       to accept this; we still require the right link order with the
+       correctly linked executable.
+       Reported by Roumen Petrov and others.
+
 2008-11-23  Roumen Petrov  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/tests/link-order2.at b/tests/link-order2.at
index d5e891a..57ff4a0 100644
--- a/tests/link-order2.at
+++ b/tests/link-order2.at
@@ -83,7 +83,7 @@ extern int a (void);
 extern int b (void);
 int main (void)
 {
-  return a () + b ();
+  return !(a () + b () == 0);
 }
 EOF
 
@@ -126,7 +126,7 @@ for type_of_depdepl in libtool non-libtool; do
     AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $static -o 
wrong$EXEEXT main.$OBJEXT -la0 libb.la],
             [], [ignore], [ignore])
     if test $shared_fails,$static != yes,; then
-      LT_AT_EXEC_CHECK([./wrong], [2])
+      LT_AT_EXEC_CHECK([./wrong], [1], [], [ignore], [|| (exit 1)])
     fi
 
     $LIBTOOL --mode=install cp liba1.la $libdir/liba1.la
@@ -136,7 +136,7 @@ for type_of_depdepl in libtool non-libtool; do
     $LIBTOOL --mode=clean rm -f liba1.la libb.la
     LT_AT_EXEC_CHECK([$bindir/main])
     if test $shared_fails,$static != yes,; then
-      LT_AT_EXEC_CHECK([$bindir/wrong], [2])
+      LT_AT_EXEC_CHECK([$bindir/wrong], [1], [], [ignore], [|| (exit 1)])
     fi
   done
 done


hooks/post-receive
--
GNU Libtool