From 33a203f1cb9db75329f0024f81c009de78084b62 Mon Sep 17 00:00:00 2001 From: Petar Jovanovic Date: Tue, 31 Jan 2017 18:22:20 +0000 Subject: [PATCH] force old implementation of std::string for leak_cpp_interior test This patch forces leak_cpp_interior to be compiled using old implementation of std::string. Related issue #373069 Patch by Aleksandar Rikalo. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16217 --- memcheck/tests/leak_cpp_interior.cpp | 1 + memcheck/tests/leak_cpp_interior.stderr.exp | 4 ++-- memcheck/tests/leak_cpp_interior.stderr.exp-64bit | 4 ++-- memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris | 4 ++-- memcheck/tests/leak_cpp_interior.stderr.exp-solaris | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp index f66fc8946f..a4b4824522 100644 --- a/memcheck/tests/leak_cpp_interior.cpp +++ b/memcheck/tests/leak_cpp_interior.cpp @@ -1,3 +1,4 @@ +#define _GLIBCXX_USE_CXX11_ABI 0 #define __STDC_FORMAT_MACROS #include #include diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp index 3228f74832..70e2764f42 100644 --- a/memcheck/tests/leak_cpp_interior.stderr.exp +++ b/memcheck/tests/leak_cpp_interior.stderr.exp @@ -2,8 +2,8 @@ valgrind output will go to log VALGRIND_DO_LEAK_CHECK 4 bytes in 1 blocks are definitely lost in loss record ... of ... - by 0x........: doit() (leak_cpp_interior.cpp:115) - by 0x........: main (leak_cpp_interior.cpp:130) + by 0x........: doit() (leak_cpp_interior.cpp:116) + by 0x........: main (leak_cpp_interior.cpp:131) LEAK SUMMARY: definitely lost: 4 bytes in 1 blocks diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit index 7a862a3cce..612fa3e1ae 100644 --- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit +++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit @@ -2,8 +2,8 @@ valgrind output will go to log VALGRIND_DO_LEAK_CHECK 8 bytes in 1 blocks are definitely lost in loss record ... of ... - by 0x........: doit() (leak_cpp_interior.cpp:115) - by 0x........: main (leak_cpp_interior.cpp:130) + by 0x........: doit() (leak_cpp_interior.cpp:116) + by 0x........: main (leak_cpp_interior.cpp:131) LEAK SUMMARY: definitely lost: 8 bytes in 1 blocks diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris index d53e4ce228..f7e1a0718c 100644 --- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris +++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris @@ -2,8 +2,8 @@ valgrind output will go to log VALGRIND_DO_LEAK_CHECK 8 bytes in 1 blocks are definitely lost in loss record ... of ... - by 0x........: doit() (leak_cpp_interior.cpp:115) - by 0x........: main (leak_cpp_interior.cpp:130) + by 0x........: doit() (leak_cpp_interior.cpp:116) + by 0x........: main (leak_cpp_interior.cpp:131) LEAK SUMMARY: definitely lost: 8 bytes in 1 blocks diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-solaris b/memcheck/tests/leak_cpp_interior.stderr.exp-solaris index 80cd5c3413..f9fc390bd7 100644 --- a/memcheck/tests/leak_cpp_interior.stderr.exp-solaris +++ b/memcheck/tests/leak_cpp_interior.stderr.exp-solaris @@ -2,8 +2,8 @@ valgrind output will go to log VALGRIND_DO_LEAK_CHECK 4 bytes in 1 blocks are definitely lost in loss record ... of ... - by 0x........: doit() (leak_cpp_interior.cpp:115) - by 0x........: main (leak_cpp_interior.cpp:130) + by 0x........: doit() (leak_cpp_interior.cpp:116) + by 0x........: main (leak_cpp_interior.cpp:131) LEAK SUMMARY: definitely lost: 4 bytes in 1 blocks -- 2.47.2