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

diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp
index f66fc8946fa928ad0d4d5618fef18caf483eb315..a4b48245227ee271c3d89643c6d2c7c474483a1f 100644 (file)
--- 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 <inttypes.h>
 #include <stdio.h>

diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp
index 3228f7483257025144bac79f3a55a762177851ca..70e2764f4233ef1102aab64e39c4a58664c3dfc1 100644 (file)
--- 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 7a862a3cce4f8e998310fb7a23cf4df8f5c6e568..612fa3e1ae78f6590da6aaac5a91807f9441a5f1 100644 (file)
--- 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 d53e4ce228fead77ff62e2dc5271761aab74fb63..f7e1a0718c92bef424e1a497055431da474575f8 100644 (file)
--- 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 80cd5c341368a206a520a730e60544ae0b894308..f9fc390bd7b6c60824283dac0f3656297797a455 100644 (file)
--- 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