diff options
| -rw-r--r-- | trunk/ChangeLog | 2 | ||||
| -rwxr-xr-x | trunk/testsuite/cxx3.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index ac39b07..f950603 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,5 +1,7 @@ 2011-08-26 Jakub Jelinek <jakub@redhat.com> + * testsuite/cxx3.sh: Expect fewer conflicts. + * src/arch-arm.c (PL_ARCH): Change .dynamic_linker to /lib/ld-linux.so.3. diff --git a/trunk/testsuite/cxx3.sh b/trunk/testsuite/cxx3.sh index dcd2b7f..bc798a6 100755 --- a/trunk/testsuite/cxx3.sh +++ b/trunk/testsuite/cxx3.sh @@ -11,7 +11,7 @@ savelibs echo $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx3 > cxx3.log $PRELINK -vvvv ${PRELINK_OPTS--vm} ./cxx3 >> cxx3.log 2>&1 || exit 1 grep ^`echo $PRELINK | sed 's/ .*$/: /'` cxx3.log | grep -q -v 'C++ conflict' && exit 2 -[ $( grep ^`echo $PRELINK | sed 's/ .*$/: /'` cxx3.log | grep 'Removing C++ conflict' | wc -l ) -ge 34 ] || exit 3 +[ $( grep ^`echo $PRELINK | sed 's/ .*$/: /'` cxx3.log | grep 'Removing C++ conflict' | wc -l ) -ge 29 ] || exit 3 LD_LIBRARY_PATH=. ./cxx3 || exit 4 readelf -a ./cxx3 >> cxx3.log 2>&1 || exit 5 # So that it is not prelinked again |