|
From: <sv...@va...> - 2006-12-12 01:38:20
|
Author: sewardj
Date: 2006-12-12 01:38:15 +0000 (Tue, 12 Dec 2006)
New Revision: 6395
Log:
Minor tidying for regtests on AIX.
Modified:
trunk/aix5libc.supp
trunk/configure.in
trunk/memcheck/tests/sh-mem-random.c
trunk/memcheck/tests/sh-mem.c
trunk/none/tests/Makefile.am
trunk/none/tests/sem.c
trunk/tests/filter_stderr_basic
Modified: trunk/aix5libc.supp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/aix5libc.supp 2006-12-11 03:23:41 UTC (rev 6394)
+++ trunk/aix5libc.supp 2006-12-12 01:38:15 UTC (rev 6395)
@@ -28,6 +28,14 @@
fun:pthread_init
}
{
+ AIX-thread_setmystate-padding-kludge-1a
+ Memcheck:Param
+ thread_setmystate(arg1)
+ fun:_set_pthread
+ fun:_alloc_initial_pthread
+ fun:__pth_init
+}
+{
AIX-thread_setmystate-padding-kludge-2
Memcheck:Param
thread_setmystate(arg1)
@@ -655,7 +663,6 @@
AIX64-uu-sz4
Memcheck:Addr4
obj:/usr/ccs/bin/usla64
- obj:/usr/ccs/bin/usla64
}
{
AIX64-uu-sz2
@@ -782,7 +789,7 @@
AIX64-__loadx-pthread_init-sz8
Memcheck:Addr8
fun:__loadx
- fun:pthread_init
+ fun:*pth*_init
}
=20
{
@@ -805,3 +812,22 @@
fun:load
obj:*/libppe*.a(*.o)
}
+
+#####
+
+{
+ AIX-libodm_tsd_destroy-free
+ Memcheck:Free
+ fun:free
+ fun:libodm_tsd_destroy
+ fun:__odm_initfini_fini
+}
+
+{
+ AIX64-usl-resolve-sz1
+ Memcheck:Addr1
+ obj:*
+ fun:usl_resolve
+ fun:uload
+ fun:load
+}
Modified: trunk/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/configure.in 2006-12-11 03:23:41 UTC (rev 6394)
+++ trunk/configure.in 2006-12-12 01:38:15 UTC (rev 6395)
@@ -485,15 +485,15 @@
;;
=09
aix5)
- AC_MSG_RESULT(AIX 5.1, 5.2 or 5.3)
- AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1, 5.2 or =
5.3])
+ AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
+ AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 o=
r 5.3])
DEFAULT_SUPP=3D"aix5libc.supp ${DEFAULT_SUPP}"
;;
=20
*)
AC_MSG_RESULT(unsupported version)
AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
- AC_MSG_ERROR([or AIX 5.2/5.3 libc])
+ AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 libc])
;;
esac
=20
Modified: trunk/memcheck/tests/sh-mem-random.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/sh-mem-random.c 2006-12-11 03:23:41 UTC (rev 639=
4)
+++ trunk/memcheck/tests/sh-mem-random.c 2006-12-12 01:38:15 UTC (rev 639=
5)
@@ -244,7 +244,7 @@
=20
for (tries =3D 0; tries < 10; tries++) {
arr =3D mmap(huge_addr, nbytes_p, PROT_READ|PROT_WRITE,=20
- MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, 0,0);
+ MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, -1,0);
if (arr !=3D MAP_FAILED)
break;
// hmm. fudge the address and try again.
Modified: trunk/memcheck/tests/sh-mem.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/sh-mem.c 2006-12-11 03:23:41 UTC (rev 6394)
+++ trunk/memcheck/tests/sh-mem.c 2006-12-12 01:38:15 UTC (rev 6395)
@@ -97,7 +97,9 @@
// the address space (which would trigger the slow cases in
// LOADVn/STOREVn) on 64-bit platforms).
assert( 0 =3D=3D (long)a % 8);
- assert((U1*)a < (U1*)0xefffffff);
+ if (sizeof(void*) =3D=3D 8) {
+ assert( ((U1*)(&a[0])) < ((U1*)(32ULL * 1024*1024*1024)/*32G*/) );
+ }
=20
// Check basic types have the expected sizes.
assert(1 =3D=3D sizeof(U1));
Modified: trunk/none/tests/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/Makefile.am 2006-12-11 03:23:41 UTC (rev 6394)
+++ trunk/none/tests/Makefile.am 2006-12-12 01:38:15 UTC (rev 6395)
@@ -179,7 +179,7 @@
pth_rwlock_LDADD =3D -lpthread
pth_stackalign_LDADD =3D -lpthread
pth_detached_LDADD =3D -lpthread
-if VGP_PPC32_AIX5
+if VGO_AIX5
res_search_LDADD =3D -lpthread
else
res_search_LDADD =3D -lresolv -lpthread
@@ -191,7 +191,7 @@
threadederrno_LDADD =3D -lpthread
tls_SOURCES =3D tls.c tls2.c
tls_DEPENDENCIES =3D tls.so
-if VGP_PPC32_AIX5
+if VGO_AIX5
tls_LDFLAGS =3D=20
else
tls_LDFLAGS =3D -Wl,-rpath,$(top_builddir)/none/tests
@@ -199,7 +199,7 @@
tls_LDADD =3D tls.so -lpthread
tls_so_SOURCES =3D tls_so.c
tls_so_DEPENDENCIES =3D tls2.so
-if VGP_PPC32_AIX5
+if VGO_AIX5
tls_so_LDFLAGS =3D -shared -fPIC
tls_so_LDADD =3D `pwd`/tls2.so
else
Modified: trunk/none/tests/sem.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/sem.c 2006-12-11 03:23:41 UTC (rev 6394)
+++ trunk/none/tests/sem.c 2006-12-12 01:38:15 UTC (rev 6395)
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <sys/ipc.h>
#include <sys/sem.h>
-
+#include <time.h>
int main(int argc, char **argv)
{
int semid;
Modified: trunk/tests/filter_stderr_basic
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tests/filter_stderr_basic 2006-12-11 03:23:41 UTC (rev 6394)
+++ trunk/tests/filter_stderr_basic 2006-12-12 01:38:15 UTC (rev 6395)
@@ -6,10 +6,10 @@
dir=3D`dirname $0`
=20
# Remove =3D=3Dpid=3D=3D and --pid-- and ++pid++ and **pid** strings=20
-sed "s/\(=3D=3D\|--\|\+\+\|\*\*\)[0-9]\{1,6\}\1 //" |
+sed "s/\(=3D=3D\|--\|\+\+\|\*\*\)[0-9]\{1,7\}\1 //" |
=20
# Remove any --pid:0: strings (debuglog level zero output)
-sed "/^--[0-9]\{1,6\}:0:*/d" |
+sed "/^--[0-9]\{1,7\}:0:*/d" |
=20
# Remove "WARNING: assuming toc 0x.." strings
sed "/^WARNING: assuming toc 0x*/d" |
|