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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 9a39c7956a7c26ba1598d980fe91045755897fa4..dc260dcd1c172468bc62da743ac81050f1d14636 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <bugtrack@roumenpetrov.info>
            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 

diff --git a/tests/link-order2.at b/tests/link-order2.at
index d5e891a0d147d118bb06cb2f51f353cd3189232e..57ff4a03ae877e5b238d7589cac56e8eaa12373b 100644 (file)
--- 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