FreeBSD regtest: improve memcheck filtering for varinfo5

Now only one real difference between clang and GCC.

diff --git a/memcheck/tests/filter_varinfo3 b/memcheck/tests/filter_varinfo3
index b7250c56e615856cfbf1e6a69a1c744256a0812e..c3e9d28e1de8f2dfff58700341d0afe800998063 100755 (executable)
--- a/memcheck/tests/filter_varinfo3
+++ b/memcheck/tests/filter_varinfo3
@@ -5,7 +5,7 @@
 ./filter_stderr "$@" |
 sed "s/static_local_def\.[0-9]*/static_local_def\.XXXX/g" |
 sed "s/static_local_undef\.[0-9]*/static_local_undef\.XXXX/g" |
-sed "s/foo.static_local_undef/static_local_undef.XXXX/g" |
-sed "s/foo.static_local_def/static_local_def.XXXX/g" |
+sed "s/foo3\{0,1\}\.static_local_undef/static_local_undef.XXXX/g" |
+sed "s/foo3\{0,1\}\.static_local_def/static_local_def.XXXX/g" |
 sed "s/frame #./frame #X/g"
 

diff --git a/memcheck/tests/varinfo5.stderr.exp-freebsd b/memcheck/tests/varinfo5.stderr.exp-freebsd
index a22b372c949061e9ec396aeddd2a80032f0a224e..ebdc8b9956c42f86e1df66cd2d6915bcb42db2d1 100644 (file)
--- a/memcheck/tests/varinfo5.stderr.exp-freebsd
+++ b/memcheck/tests/varinfo5.stderr.exp-freebsd
@@ -119,7 +119,7 @@ Uninitialised byte(s) found during client check request
    by 0x........: varinfo3_main (tests/varinfo5so.c:118)
    by 0x........: varinfo5_main (tests/varinfo5so.c:156)
    by 0x........: main (tests/varinfo5.c:5)
- Address 0x........ is 5 bytes inside data symbol "foo3.static_local_def"
+ Address 0x........ is 5 bytes inside data symbol "static_local_def.XXXX"
 
 Uninitialised byte(s) found during client check request
    at 0x........: croak (tests/varinfo5so.c:29)
@@ -138,7 +138,7 @@ Uninitialised byte(s) found during client check request
    by 0x........: varinfo3_main (tests/varinfo5so.c:118)
    by 0x........: varinfo5_main (tests/varinfo5so.c:156)
    by 0x........: main (tests/varinfo5.c:5)
- Address 0x........ is 7 bytes inside data symbol "foo3.static_local_undef"
+ Address 0x........ is 7 bytes inside data symbol "static_local_undef.XXXX"
 
 Uninitialised byte(s) found during client check request
    at 0x........: croak (tests/varinfo5so.c:29)