Second go at memcheck/tests/freebsd/relapathat

Missed adding the argument to the C file
Needs more filtering

diff --git a/memcheck/tests/freebsd/filter_realpathat b/memcheck/tests/freebsd/filter_realpathat
index 82b21841ddff8148392e2b7af0e129b0ffea4332..599a35cb389ad5e585e4a9f4d1426d04effdbec8 100755 (executable)
--- a/memcheck/tests/freebsd/filter_realpathat
+++ b/memcheck/tests/freebsd/filter_realpathat
@@ -1,6 +1,8 @@
 #! /bin/sh
 
-gsed 's/Invalid write of size 8/Invalid write of size .../' |
+gsed 's/Invalid write of size 8/Invalid write of size 4/' |
+gsed 's/is [4-9][0-9] bytes inside a block of size 100 free/is ... bytes inside a block of size 100 free/' |
+
 
 ../filter_stderr "$@"
 

diff --git a/memcheck/tests/freebsd/realpathat.c b/memcheck/tests/freebsd/realpathat.c
index d7a84240b0a67dce7fb86295df053c6f14e5568e..05a20cb924602a55016878888f0e79de0e0e965d 100644 (file)
--- a/memcheck/tests/freebsd/realpathat.c
+++ b/memcheck/tests/freebsd/realpathat.c
@@ -19,7 +19,7 @@ int main(void)
    *bad_int1 = AT_FDCWD;
    *bad_int2 = 0;
    *bad_sz = PATH_MAX;
-   syscall(SYS___realpathat, *bad_int1, self_path, buf, *bad_int2);
+   syscall(SYS___realpathat, *bad_int1, self_path, buf, *bad_sz,  *bad_int2);
    free(bad_int1);
    free(bad_int2);
    

diff --git a/memcheck/tests/freebsd/realpathat.stderr.exp b/memcheck/tests/freebsd/realpathat.stderr.exp
index 3d6647e3aebeea62d14d82a411931855228a2487..e299abcba8dbe9be593bd1327c8195ff40041147 100644 (file)
--- a/memcheck/tests/freebsd/realpathat.stderr.exp
+++ b/memcheck/tests/freebsd/realpathat.stderr.exp
@@ -10,7 +10,7 @@ Invalid write of size 4
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (realpathat.c:17)
 
-Invalid write of size ...
+Invalid write of size 4
    at 0x........: main (realpathat.c:21)
  Address 0x........ is 0 bytes inside a block of size 1 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
@@ -24,6 +24,10 @@ Syscall param __realpathat(size) contains uninitialised byte(s)
    ...
    by 0x........: main (realpathat.c:22)
 
+Syscall param __realpathat(flags) contains uninitialised byte(s)
+   ...
+   by 0x........: main (realpathat.c:22)
+
 Invalid read of size 1
    ...
    by 0x........: main (realpathat.c:32)
@@ -116,7 +120,7 @@ Invalid read of size 1
 Invalid write of size 2
    ...
    by 0x........: main (realpathat.c:32)
- Address 0x........ is 55 bytes inside a block of size 100 free'd
+ Address 0x........ is ... bytes inside a block of size 100 free'd
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (realpathat.c:29)
  Block was alloc'd at
@@ -127,7 +131,7 @@ Invalid read of size 1
    at 0x........: strlcat (vg_replace_strmem.c:...)
    ...
    by 0x........: main (realpathat.c:32)
- Address 0x........ is 56 bytes inside a block of size 100 free'd
+ Address 0x........ is ... bytes inside a block of size 100 free'd
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (realpathat.c:29)
  Block was alloc'd at
@@ -138,7 +142,7 @@ Invalid write of size 1
    at 0x........: strlcat (vg_replace_strmem.c:...)
    ...
    by 0x........: main (realpathat.c:32)
- Address 0x........ is 56 bytes inside a block of size 100 free'd
+ Address 0x........ is ... bytes inside a block of size 100 free'd
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (realpathat.c:29)
  Block was alloc'd at
@@ -149,7 +153,7 @@ Invalid write of size 1
    at 0x........: strlcat (vg_replace_strmem.c:...)
    ...
    by 0x........: main (realpathat.c:32)
- Address 0x........ is 66 bytes inside a block of size 100 free'd
+ Address 0x........ is ... bytes inside a block of size 100 free'd
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (realpathat.c:29)
  Block was alloc'd at
@@ -159,7 +163,7 @@ Invalid write of size 1
 Syscall param fstatat(path) points to unaddressable byte(s)
    ...
    by 0x........: main (realpathat.c:32)
- Address 0x........ is 56 bytes inside a block of size 100 free'd
+ Address 0x........ is ... bytes inside a block of size 100 free'd
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: main (realpathat.c:29)
  Block was alloc'd at