From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 23 Nov 2008 21:54:35 +0000 (+0100)
Subject: Relax link-order2 test for systems with partial wrong order.
X-Git-Tag: v2.2.7b~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9abc9628e03d332868eaea96fb83fc5c5eef77ca;p=thirdparty%2Flibtool.git

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 9a39c7956..dc260dcd1 100644
--- 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 d5e891a0d..57ff4a03a 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