Tweak exp-ptrcheck .exp files.

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

diff --git a/exp-ptrcheck/tests/Makefile.am b/exp-ptrcheck/tests/Makefile.am
index 862819bda3cc85e63272fab00cd776b7a4e90c51..5c27f35b950e5c78607e5a42dfc1f44489bd8c0f 100644 (file)
--- a/exp-ptrcheck/tests/Makefile.am
+++ b/exp-ptrcheck/tests/Makefile.am
@@ -19,9 +19,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        bad_percentify.stdout.exp bad_percentify.stderr.exp-glibc28-amd64 \
        base.vgtest \
        base.stderr.exp-glibc25-amd64 base.stderr.exp-glibc25-x86 \
-       ccc.vgtest \
-       ccc.stderr.exp-glibc25-x86 ccc.stderr.exp-glibc25-amd64 \
-       ccc.stderr.exp-glibc27-x86 ccc.stderr.exp-glibc28-amd64 \
+       ccc.vgtest ccc.stderr.exp-glibc25-amd64 \
+           ccc.stderr.exp-glibc27-x86 ccc.stderr.exp-glibc28-amd64 \
        cmp.vgtest-disabled cmp.stderr.exp \
        globalerr.vgtest globalerr.stdout.exp \
        globalerr.stderr.exp-glibc28-amd64 \

diff --git a/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64 b/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64
index aaaf3fbe86e2a2958d085f891f26e04d70fa6bf5..7e0e2a77b11dabd8157f2998de91406f9f102ceb 100644 (file)
--- a/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64
+++ b/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-amd64
@@ -17,7 +17,7 @@ Invalid read of size 4
    at 0x........: main (ccc.cpp:22)
  Address 0x........ is 4 bytes before the accessing pointer's
  legitimate range, a block of size 40 alloc'd
-   at 0x........: ...operator new... (vg_replace_malloc.c:...)
+   at 0x........: ...operator new[]... (vg_replace_malloc.c:...)
    by 0x........: main (ccc.cpp:10)
 
 Invalid read of size 4

diff --git a/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-x86 b/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-x86
deleted file mode 100644 (file)
index 7e0e2a7..0000000
--- a/exp-ptrcheck/tests/ccc.stderr.exp-glibc25-x86
+++ /dev/null
@@ -1,45 +0,0 @@
-
-Invalid read of size 4
-   at 0x........: main (ccc.cpp:20)
- Address 0x........ is 4 bytes before the accessing pointer's
- legitimate range, a block of size 4 alloc'd
-   at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: main (ccc.cpp:8)
-
-Invalid read of size 4
-   at 0x........: main (ccc.cpp:21)
- Address 0x........ is 4 bytes before the accessing pointer's
- legitimate range, a block of size 4 alloc'd
-   at 0x........: ...operator new... (vg_replace_malloc.c:...)
-   by 0x........: main (ccc.cpp:9)
-
-Invalid read of size 4
-   at 0x........: main (ccc.cpp:22)
- Address 0x........ is 4 bytes before the accessing pointer's
- legitimate range, a block of size 40 alloc'd
-   at 0x........: ...operator new[]... (vg_replace_malloc.c:...)
-   by 0x........: main (ccc.cpp:10)
-
-Invalid read of size 4
-   at 0x........: main (ccc.cpp:22)
- Address 0x........ is 4 bytes before the accessing pointer's
- legitimate range, a block of size 4 alloc'd
-   at 0x........: calloc (vg_replace_malloc.c:...)
-   by 0x........: main (ccc.cpp:11)
-
-Invalid read of size 4
-   at 0x........: main (ccc.cpp:23)
- Address 0x........ is 4 bytes before the accessing pointer's
- legitimate range, a block of size 4 alloc'd
-   at 0x........: memalign (vg_replace_malloc.c:...)
-   by 0x........: main (ccc.cpp:12)
-
-Invalid read of size 4
-   at 0x........: main (ccc.cpp:24)
- Address 0x........ is 4 bytes before the accessing pointer's
- legitimate range, a block of size 4 alloc'd
-   at 0x........: memalign (vg_replace_malloc.c:...)
-   by 0x........: posix_memalign (vg_replace_malloc.c:...)
-   by 0x........: main (ccc.cpp:14)
-
-ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)