|
 |
1f061d |
commit 4e66d0f7ca6ef2cac6c303e761af605c82b78456
|
|
|
1f061d |
Author: petarj <petarj@a5019735-40e9-0310-863c-91ae7b9d1cf9>
|
|
|
1f061d |
Date: Tue Jan 31 18:22:20 2017 +0000
|
|
|
1f061d |
|
|
|
1f061d |
force old implementation of std::string for leak_cpp_interior test
|
|
|
1f061d |
|
|
|
1f061d |
This patch forces leak_cpp_interior to be compiled using old implementation
|
|
|
1f061d |
of std::string.
|
|
|
1f061d |
|
|
|
1f061d |
Related issue #373069
|
|
|
1f061d |
|
|
|
1f061d |
Patch by Aleksandar Rikalo.
|
|
|
1f061d |
|
|
|
1f061d |
|
|
|
1f061d |
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16217 a5019735-40e9-0310-863c-91ae7b9d1cf9
|
|
|
1f061d |
|
|
|
1f061d |
diff --git a/memcheck/tests/leak_cpp_interior.cpp b/memcheck/tests/leak_cpp_interior.cpp
|
|
|
1f061d |
index f66fc89..a4b4824 100644
|
|
|
1f061d |
--- a/memcheck/tests/leak_cpp_interior.cpp
|
|
|
1f061d |
+++ b/memcheck/tests/leak_cpp_interior.cpp
|
|
|
1f061d |
@@ -1,3 +1,4 @@
|
|
|
1f061d |
+#define _GLIBCXX_USE_CXX11_ABI 0
|
|
|
1f061d |
#define __STDC_FORMAT_MACROS
|
|
|
1f061d |
#include <inttypes.h>
|
|
|
1f061d |
#include <stdio.h>
|
|
|
1f061d |
diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp b/memcheck/tests/leak_cpp_interior.stderr.exp
|
|
|
1f061d |
index 3228f74..70e2764 100644
|
|
|
1f061d |
--- a/memcheck/tests/leak_cpp_interior.stderr.exp
|
|
|
1f061d |
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp
|
|
|
1f061d |
@@ -2,8 +2,8 @@
|
|
|
1f061d |
valgrind output will go to log
|
|
|
1f061d |
VALGRIND_DO_LEAK_CHECK
|
|
|
1f061d |
4 bytes in 1 blocks are definitely lost in loss record ... of ...
|
|
|
1f061d |
- by 0x........: doit() (leak_cpp_interior.cpp:115)
|
|
|
1f061d |
- by 0x........: main (leak_cpp_interior.cpp:130)
|
|
|
1f061d |
+ by 0x........: doit() (leak_cpp_interior.cpp:116)
|
|
|
1f061d |
+ by 0x........: main (leak_cpp_interior.cpp:131)
|
|
|
1f061d |
|
|
|
1f061d |
LEAK SUMMARY:
|
|
|
1f061d |
definitely lost: 4 bytes in 1 blocks
|
|
|
1f061d |
diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
|
|
|
1f061d |
index 7a862a3..612fa3e 100644
|
|
|
1f061d |
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
|
|
|
1f061d |
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit
|
|
|
1f061d |
@@ -2,8 +2,8 @@
|
|
|
1f061d |
valgrind output will go to log
|
|
|
1f061d |
VALGRIND_DO_LEAK_CHECK
|
|
|
1f061d |
8 bytes in 1 blocks are definitely lost in loss record ... of ...
|
|
|
1f061d |
- by 0x........: doit() (leak_cpp_interior.cpp:115)
|
|
|
1f061d |
- by 0x........: main (leak_cpp_interior.cpp:130)
|
|
|
1f061d |
+ by 0x........: doit() (leak_cpp_interior.cpp:116)
|
|
|
1f061d |
+ by 0x........: main (leak_cpp_interior.cpp:131)
|
|
|
1f061d |
|
|
|
1f061d |
LEAK SUMMARY:
|
|
|
1f061d |
definitely lost: 8 bytes in 1 blocks
|
|
|
1f061d |
diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris
|
|
|
1f061d |
index d53e4ce..f7e1a07 100644
|
|
|
1f061d |
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris
|
|
|
1f061d |
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-64bit-solaris
|
|
|
1f061d |
@@ -2,8 +2,8 @@
|
|
|
1f061d |
valgrind output will go to log
|
|
|
1f061d |
VALGRIND_DO_LEAK_CHECK
|
|
|
1f061d |
8 bytes in 1 blocks are definitely lost in loss record ... of ...
|
|
|
1f061d |
- by 0x........: doit() (leak_cpp_interior.cpp:115)
|
|
|
1f061d |
- by 0x........: main (leak_cpp_interior.cpp:130)
|
|
|
1f061d |
+ by 0x........: doit() (leak_cpp_interior.cpp:116)
|
|
|
1f061d |
+ by 0x........: main (leak_cpp_interior.cpp:131)
|
|
|
1f061d |
|
|
|
1f061d |
LEAK SUMMARY:
|
|
|
1f061d |
definitely lost: 8 bytes in 1 blocks
|
|
|
1f061d |
diff --git a/memcheck/tests/leak_cpp_interior.stderr.exp-solaris b/memcheck/tests/leak_cpp_interior.stderr.exp-solaris
|
|
|
1f061d |
index 80cd5c3..f9fc390 100644
|
|
|
1f061d |
--- a/memcheck/tests/leak_cpp_interior.stderr.exp-solaris
|
|
|
1f061d |
+++ b/memcheck/tests/leak_cpp_interior.stderr.exp-solaris
|
|
|
1f061d |
@@ -2,8 +2,8 @@
|
|
|
1f061d |
valgrind output will go to log
|
|
|
1f061d |
VALGRIND_DO_LEAK_CHECK
|
|
|
1f061d |
4 bytes in 1 blocks are definitely lost in loss record ... of ...
|
|
|
1f061d |
- by 0x........: doit() (leak_cpp_interior.cpp:115)
|
|
|
1f061d |
- by 0x........: main (leak_cpp_interior.cpp:130)
|
|
|
1f061d |
+ by 0x........: doit() (leak_cpp_interior.cpp:116)
|
|
|
1f061d |
+ by 0x........: main (leak_cpp_interior.cpp:131)
|
|
|
1f061d |
|
|
|
1f061d |
LEAK SUMMARY:
|
|
|
1f061d |
definitely lost: 4 bytes in 1 blocks
|