[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Relax link-order2 test for systems with partial wrong order.
From: |
Ralf Wildenhues |
Subject: |
Relax link-order2 test for systems with partial wrong order. |
Date: |
Sun, 23 Nov 2008 22:56:49 +0100 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
* Ralf Wildenhues wrote on Wed, Nov 19, 2008 at 07:42:02AM CET:
> * Roumen Petrov wrote on Tue, Nov 18, 2008 at 11:12:56PM CET:
> > [SNIP]
> >> Test 25 "Link order of deplibs" skipped (link-order2.at:129) - in my
> >> todo for investigation.
> >
> > Still skipped. The executable exit code is 1 instead 2. No idea what is
> > problem:
>
> The test is too strict.
Fixed like this.
Cheers,
Ralf
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.
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
- Re: testsuite.at for version 2.x Was: ... mingw-cross, check-local fail for DESTDIR tests, (continued)
- Re: testsuite.at for version 2.x Was: ... mingw-cross, check-local fail for DESTDIR tests, Roumen Petrov, 2008/11/17
- Re: testsuite.at for version 2.x Was: ... mingw-cross, check-local fail for DESTDIR tests, Roumen Petrov, 2008/11/18
- Re: testsuite.at for version 2.x Was: ... mingw-cross, check-local fail for DESTDIR tests, Ralf Wildenhues, 2008/11/19
- Re: testsuite.at for version 2.x Was: ... mingw-cross, check-local fail for DESTDIR tests, Ralf Wildenhues, 2008/11/23
- use $EXEEXT consistently in new testsuite, Ralf Wildenhues, 2008/11/23
- Re: use $EXEEXT consistently in new testsuite, Roumen Petrov, 2008/11/25
- Re: use $EXEEXT consistently in new testsuite, Ralf Wildenhues, 2008/11/27
- Re: use $EXEEXT consistently in new testsuite, Roumen Petrov, 2008/11/27
- Relax link-order2 test for systems with partial wrong order.,
Ralf Wildenhues <=
- Fix expout and experr line ending issues., Ralf Wildenhues, 2008/11/23