Darwin regtest and version: remove last trace of DARWIN_10_6

diff --git a/memcheck/tests/posix_memalign.c b/memcheck/tests/posix_memalign.c
index 6000c42ddabfc03fd284342950f404d60c584ffc..2304942bc003fed59d45f790e8f550cab02d855d 100644 (file)
--- a/memcheck/tests/posix_memalign.c
+++ b/memcheck/tests/posix_memalign.c
@@ -20,7 +20,6 @@
 
 int main ( void )
 {
-#  if !defined(VGO_darwin) || (DARWIN_VERS >= DARWIN_10_6)
    // Nb: assuming VG_MIN_MALLOC_SZB is 8 or more...
    int* p;
    int  res;
@@ -70,5 +69,4 @@ int main ( void )
    res = PM(&p, 16 * 1024 * 1024, 100);
    assert(0 == res && p && 0 == (long)p % (16 * 1024 * 1024));
    free(p);
-#endif
 }

diff --git a/memcheck/tests/posix_memalign.stderr.exp b/memcheck/tests/posix_memalign.stderr.exp
index 1c4701370b03f2855e19c17e42af12a1e2c2184d..1c8c7294e52310bbf0eeb692884b41aaaea337f4 100644 (file)
--- a/memcheck/tests/posix_memalign.stderr.exp
+++ b/memcheck/tests/posix_memalign.stderr.exp
@@ -1,40 +1,40 @@
 Unsafe allocation with size of zero is implementation-defined
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:32)
+   by 0x........: main (posix_memalign.c:31)
 
 Invalid alignment value: 18446744073709551615 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:40)
+   by 0x........: main (posix_memalign.c:39)
 
 Invalid alignment value: 0 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:42)
+   by 0x........: main (posix_memalign.c:41)
 
 Invalid alignment value: 1 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:44)
+   by 0x........: main (posix_memalign.c:43)
 
 Invalid alignment value: 2 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:46)
+   by 0x........: main (posix_memalign.c:45)
 
 Invalid alignment value: 3 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:48)
+   by 0x........: main (posix_memalign.c:47)
 
 Invalid alignment value: 31 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:53)
+   by 0x........: main (posix_memalign.c:52)
 
 Invalid alignment value: 33 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:58)
+   by 0x........: main (posix_memalign.c:57)
 
 Invalid alignment value: 4095 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:60)
+   by 0x........: main (posix_memalign.c:59)
 
 Invalid alignment value: 4097 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (posix_memalign.c:65)
+   by 0x........: main (posix_memalign.c:64)
 

diff --git a/memcheck/tests/posix_memalign.stderr.exp-darwin b/memcheck/tests/posix_memalign.stderr.exp-darwin
index f044fa1bf0a755da4d234c393a6154658fff442f..da79f7d6e511457dd03cafcb6771b1bbb221db47 100644 (file)
--- a/memcheck/tests/posix_memalign.stderr.exp-darwin
+++ b/memcheck/tests/posix_memalign.stderr.exp-darwin
@@ -1,50 +1,50 @@
 Unsafe allocation with size of zero is implementation-defined
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:32)
+   by 0x........: main (posix_memalign.c:31)
 
 Invalid alignment value: 18446744073709551615 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:40)
+   by 0x........: main (posix_memalign.c:39)
 
 Invalid alignment value: 0 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:42)
+   by 0x........: main (posix_memalign.c:41)
 
 Invalid alignment value: 1 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:44)
+   by 0x........: main (posix_memalign.c:43)
 
 Invalid alignment value: 2 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:46)
+   by 0x........: main (posix_memalign.c:45)
 
 Invalid alignment value: 3 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:48)
+   by 0x........: main (posix_memalign.c:47)
 
 Invalid alignment value: 31 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:53)
+   by 0x........: main (posix_memalign.c:52)
 
 Invalid alignment value: 33 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:58)
+   by 0x........: main (posix_memalign.c:57)
 
 Invalid alignment value: 4095 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:60)
+   by 0x........: main (posix_memalign.c:59)
 
 Invalid alignment value: 4097 (should be non-zero, a power of 2 and a multiple of sizeof(void*))
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
-   by 0x........: main (posix_memalign.c:65)
+   by 0x........: main (posix_memalign.c:64)