Mark Wielaard 9e7a75
commit 3d62ad9a0158a1fe56cf3cff9fc49bfb6d504b27
Mark Wielaard 9e7a75
Author: florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Mark Wielaard 9e7a75
Date:   Mon Nov 24 22:30:49 2014 +0000
Mark Wielaard 9e7a75
Mark Wielaard 9e7a75
    Change the testcase to not depend on the type of 'this' in the output.
Mark Wielaard 9e7a75
    GCC 4.9.2 and GCC 4.8.x have different opinions about that variable's type.
Mark Wielaard 9e7a75
    
Mark Wielaard 9e7a75
    
Mark Wielaard 9e7a75
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14780 a5019735-40e9-0310-863c-91ae7b9d1cf9
Mark Wielaard 9e7a75
Mark Wielaard 9e7a75
diff --git a/memcheck/tests/demangle.cpp b/memcheck/tests/demangle.cpp
Mark Wielaard 9e7a75
index 6fb2b98..ff15fe1 100644
Mark Wielaard 9e7a75
--- a/memcheck/tests/demangle.cpp
Mark Wielaard 9e7a75
+++ b/memcheck/tests/demangle.cpp
Mark Wielaard 9e7a75
@@ -16,7 +16,7 @@ class magic {
Mark Wielaard 9e7a75
 public:
Mark Wielaard 9e7a75
   T xyzzy(T *p)
Mark Wielaard 9e7a75
   {
Mark Wielaard 9e7a75
-    return (new abc::def<int,typeof(this)>)->xyzzy(p, 0);
Mark Wielaard 9e7a75
+    return (new abc::def<int,typeof(*this)>)->xyzzy(p, 0);
Mark Wielaard 9e7a75
   }
Mark Wielaard 9e7a75
 };
Mark Wielaard 9e7a75
 
Mark Wielaard 9e7a75
diff --git a/memcheck/tests/demangle.stderr.exp b/memcheck/tests/demangle.stderr.exp
Mark Wielaard 9e7a75
index b79c638..2124517 100644
Mark Wielaard 9e7a75
--- a/memcheck/tests/demangle.stderr.exp
Mark Wielaard 9e7a75
+++ b/memcheck/tests/demangle.stderr.exp
Mark Wielaard 9e7a75
@@ -1,6 +1,6 @@
Mark Wielaard 9e7a75
 
Mark Wielaard 9e7a75
 Conditional jump or move depends on uninitialised value(s)
Mark Wielaard 9e7a75
-   at 0x........: abc::def<int, magic<int>* const>::xyzzy(int*, magic<int>* const*) (demangle.cpp:9)
Mark Wielaard 9e7a75
+   at 0x........: abc::def<int, magic<int> >::xyzzy(int*, magic<int>*) (demangle.cpp:9)
Mark Wielaard 9e7a75
    by 0x........: magic<int>::xyzzy(int*) (demangle.cpp:19)
Mark Wielaard 9e7a75
    by 0x........: main (demangle.cpp:27)
Mark Wielaard 9e7a75
 
Mark Wielaard 9e7a75
commit 79a59b53abd68d3d5df2f77bfbe23d6c3eab0e4b
Mark Wielaard 9e7a75
Author: mjw <mjw@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Mark Wielaard 9e7a75
Date:   Wed Jun 3 09:52:00 2015 +0000
Mark Wielaard 9e7a75
Mark Wielaard 9e7a75
    Run memcheck/tests/demangle with -q.
Mark Wielaard 9e7a75
    
Mark Wielaard 9e7a75
    The interesting part is the demangled backtrace in the error message.
Mark Wielaard 9e7a75
    Suppress the memory allocation/blocks summary which can differ slightly
Mark Wielaard 9e7a75
    depending on the underlying arch/libs.
Mark Wielaard 9e7a75
    
Mark Wielaard 9e7a75
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15308 a5019735-40e9-0310-863c-91ae7b9d1cf9
Mark Wielaard 9e7a75
Mark Wielaard 9e7a75
diff --git a/memcheck/tests/demangle.stderr.exp b/memcheck/tests/demangle.stderr.exp
Mark Wielaard 9e7a75
index 2124517..6e7467d 100644
Mark Wielaard 9e7a75
--- a/memcheck/tests/demangle.stderr.exp
Mark Wielaard 9e7a75
+++ b/memcheck/tests/demangle.stderr.exp
Mark Wielaard 9e7a75
@@ -1,16 +1,5 @@
Mark Wielaard 9e7a75
-
Mark Wielaard 9e7a75
 Conditional jump or move depends on uninitialised value(s)
Mark Wielaard 9e7a75
    at 0x........: abc::def<int, magic<int> >::xyzzy(int*, magic<int>*) (demangle.cpp:9)
Mark Wielaard 9e7a75
    by 0x........: magic<int>::xyzzy(int*) (demangle.cpp:19)
Mark Wielaard 9e7a75
    by 0x........: main (demangle.cpp:27)
Mark Wielaard 9e7a75
 
Mark Wielaard 9e7a75
-
Mark Wielaard 9e7a75
-HEAP SUMMARY:
Mark Wielaard 9e7a75
-    in use at exit: 6 bytes in 3 blocks
Mark Wielaard 9e7a75
-  total heap usage: 3 allocs, 0 frees, 6 bytes allocated
Mark Wielaard 9e7a75
-
Mark Wielaard 9e7a75
-For a detailed leak analysis, rerun with: --leak-check=full
Mark Wielaard 9e7a75
-
Mark Wielaard 9e7a75
-For counts of detected and suppressed errors, rerun with: -v
Mark Wielaard 9e7a75
-Use --track-origins=yes to see where uninitialised values come from
Mark Wielaard 9e7a75
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Mark Wielaard 9e7a75
diff --git a/memcheck/tests/demangle.vgtest b/memcheck/tests/demangle.vgtest
Mark Wielaard 9e7a75
index f6ae038..b65b6d3 100644
Mark Wielaard 9e7a75
--- a/memcheck/tests/demangle.vgtest
Mark Wielaard 9e7a75
+++ b/memcheck/tests/demangle.vgtest
Mark Wielaard 9e7a75
@@ -1 +1,2 @@
Mark Wielaard 9e7a75
 prog: demangle
Mark Wielaard 9e7a75
+vgopts: -q