Minor tidying for regtests on AIX.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6395

diff --git a/aix5libc.supp b/aix5libc.supp
index 66f52401c3f3e80222da97e52d765514b335565c..f70c1f8099ee715a13c2b666d249adb02e7dcada 100644 (file)
--- a/aix5libc.supp
+++ b/aix5libc.supp
@@ -27,6 +27,14 @@
    fun:_alloc_initial_pthread
    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
@@ -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
 }
 
 {
@@ -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
+}

diff --git a/configure.in b/configure.in
index f625a9ef51fd28b7b91f115edc8635c1f2cdf270..d4aff7051f5700958006bc8151067091a3c1e3ba 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -485,15 +485,15 @@ case "${libc}" in
        ;;
        
      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 or 5.3])
        DEFAULT_SUPP="aix5libc.supp ${DEFAULT_SUPP}"
        ;;
 
      *)
        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
 

diff --git a/memcheck/tests/sh-mem-random.c b/memcheck/tests/sh-mem-random.c
index 9cea381e0134142641889b9f24b92755bc236032..1ec715b2a64730a77663c803efd9d9c52d0f74b0 100644 (file)
--- a/memcheck/tests/sh-mem-random.c
+++ b/memcheck/tests/sh-mem-random.c
@@ -244,7 +244,7 @@ int main(void)
 
       for (tries = 0; tries < 10; tries++) {
          arr = mmap(huge_addr, nbytes_p, PROT_READ|PROT_WRITE, 
-                    MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, 0,0);
+                    MAP_FIXED|MAP_PRIVATE|MAP_ANONYMOUS, -1,0);
         if (arr != MAP_FAILED)
             break;
         // hmm. fudge the address and try again.

diff --git a/memcheck/tests/sh-mem.c b/memcheck/tests/sh-mem.c
index f6323d990480f4c71ea110605c2599b354127845..a0f018441a24e182c4498a7c36d9d6d51cb88d06 100644 (file)
--- a/memcheck/tests/sh-mem.c
+++ b/memcheck/tests/sh-mem.c
@@ -97,7 +97,9 @@ int main(void)
    // the address space (which would trigger the slow cases in
    // LOADVn/STOREVn) on 64-bit platforms).
    assert( 0 == (long)a % 8);
-   assert((U1*)a < (U1*)0xefffffff);
+   if (sizeof(void*) == 8) {
+      assert( ((U1*)(&a[0])) < ((U1*)(32ULL * 1024*1024*1024)/*32G*/) );
+   }
 
    // Check basic types have the expected sizes.
    assert(1 == sizeof(U1));

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 1e71bd087018f7eaeb04d2447aa2cd3a79970153..197a2d1260285ecfbb8ecea2e5c31dee24d3162d 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -179,7 +179,7 @@ pth_once_LDADD              = -lpthread
 pth_rwlock_LDADD       = -lpthread
 pth_stackalign_LDADD   = -lpthread
 pth_detached_LDADD      = -lpthread
-if VGP_PPC32_AIX5
+if VGO_AIX5
  res_search_LDADD       = -lpthread
 else
  res_search_LDADD       = -lresolv -lpthread
@@ -191,7 +191,7 @@ threaded_fork_LDADD = -lpthread
 threadederrno_LDADD    = -lpthread
 tls_SOURCES            = tls.c tls2.c
 tls_DEPENDENCIES       = tls.so
-if VGP_PPC32_AIX5
+if VGO_AIX5
  tls_LDFLAGS           = 
 else
  tls_LDFLAGS           = -Wl,-rpath,$(top_builddir)/none/tests
@@ -199,7 +199,7 @@ endif
 tls_LDADD              = tls.so -lpthread
 tls_so_SOURCES         = tls_so.c
 tls_so_DEPENDENCIES    = tls2.so
-if VGP_PPC32_AIX5
+if VGO_AIX5
  tls_so_LDFLAGS                = -shared -fPIC
  tls_so_LDADD          = `pwd`/tls2.so
 else

diff --git a/none/tests/sem.c b/none/tests/sem.c
index f892e930cd608a50596856aa038699a595cacbd8..ef3c09108e29a3408f8a7ea826c9f43dd1631914 100644 (file)
--- a/none/tests/sem.c
+++ b/none/tests/sem.c
@@ -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;

diff --git a/tests/filter_stderr_basic b/tests/filter_stderr_basic
index 88d4b3cda752abadf0f6c8282fce2e13e0b81ec2..578aa7e2e51280ae2d0dd433ddd9919e5a95ae6d 100755 (executable)
--- a/tests/filter_stderr_basic
+++ b/tests/filter_stderr_basic
@@ -6,10 +6,10 @@
 dir=`dirname $0`
 
 # Remove ==pid== and --pid-- and ++pid++ and **pid** strings 
-sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,6\}\1 //"             |
+sed "s/\(==\|--\|\+\+\|\*\*\)[0-9]\{1,7\}\1 //"             |
 
 # Remove any --pid:0: strings (debuglog level zero output)
-sed "/^--[0-9]\{1,6\}:0:*/d" |
+sed "/^--[0-9]\{1,7\}:0:*/d" |
 
 # Remove "WARNING: assuming toc 0x.." strings
 sed "/^WARNING: assuming toc 0x*/d" |