From: Ivo Raisr <ivosh@ivosh.net>
Date: Wed, 24 Feb 2016 03:20:17 +0000 (+0000)
Subject: Fix expected output of coredump generating test cases
X-Git-Tag: svn/VALGRIND_3_12_0~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d7ee1151c7fed50263b7e196abc4da4b39e27fa;p=thirdparty%2Fvalgrind.git

Fix expected output of coredump generating test cases
after SVN r15810.

Now that we have AT_ENTRY in the client auxv, mdb does not
print binary name before function designation.
n-i-bz


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

diff --git a/none/tests/amd64-solaris/coredump_single_thread.post.exp b/none/tests/amd64-solaris/coredump_single_thread.post.exp
index 10f46dfeb2..34bd669066 100644
--- a/none/tests/amd64-solaris/coredump_single_thread.post.exp
+++ b/none/tests/amd64-solaris/coredump_single_thread.post.exp
@@ -14,7 +14,7 @@ status: process terminated by SIGSEGV (Segmentation Fault), addr=........
                                 %r15 = 0x000000000000010e
 
 
-%rip = 0x........  coredump_single_thread`inner+0x........
+%rip = 0x........  inner+0x........
 %rsp = 0x000000000000010f
 
 
@@ -22,7 +22,7 @@ status: process terminated by SIGSEGV (Segmentation Fault), addr=........
    %err = 0x0
 
 ---Stack trace---
-coredump_single_thread`inner
-coredump_single_thread`outer
-coredump_single_thread`main
-coredump_single_thread`_start
+inner
+outer
+main
+_start
diff --git a/none/tests/solaris/coredump_many_threads.post.exp b/none/tests/solaris/coredump_many_threads.post.exp
index 9a1e6997ff..a595635de0 100644
--- a/none/tests/solaris/coredump_many_threads.post.exp
+++ b/none/tests/solaris/coredump_many_threads.post.exp
@@ -11,48 +11,48 @@ libc.so.1`_lwp_start
 
 1 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`main
-coredump_many_threads`_start
+main
+_start
 
 2 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func2
+thread_func2
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
 3 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func3
+thread_func3
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
 4 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func4
+thread_func4
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
 6 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func6
+thread_func6
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
 7 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func7
+thread_func7
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
 8 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func8
+thread_func8
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
 9 UNPARKED <NONE> 1
 libc.so.1`sleep
-coredump_many_threads`thread_func9
+thread_func9
 libc.so.1`_thrp_setup
 libc.so.1`_lwp_start
 
diff --git a/none/tests/solaris/filter_coredump_many_threads_post b/none/tests/solaris/filter_coredump_many_threads_post
index 28e1c996b7..2d033700ef 100755
--- a/none/tests/solaris/filter_coredump_many_threads_post
+++ b/none/tests/solaris/filter_coredump_many_threads_post
@@ -15,5 +15,5 @@ echo "::stacks ! perl -p -e 's/^(\S+)\+.*/\$1/g'" | /usr/bin/mdb vgcore.* | \
 perl -p -e 's/^(THREAD)\s+(STATE)\s+(SOBJ)\s+(COUNT)\s*$/$1 $2 $3 $4\n/' | \
 perl -p -e 's/^(\d+)\s+(UNPARKED)\s+(\S+)\s+(\d+)/$1 $2 $3 $4/g' | \
 perl -p -e 's/^\s*libc.*.so.1/libc.so.1/g' | \
-perl -p -e 's/^\s*(coredump_many_threads)/$1/g' | \
-perl -p -e 's/\+0x[0-9A-Fa-f]+//g'
+perl -p -e 's/\+0x[0-9A-Fa-f]+//g' |
+sed 's/^ *//g'
diff --git a/none/tests/x86-solaris/coredump_single_thread.post.exp b/none/tests/x86-solaris/coredump_single_thread.post.exp
index 34d45fa548..446a0290f0 100644
--- a/none/tests/x86-solaris/coredump_single_thread.post.exp
+++ b/none/tests/x86-solaris/coredump_single_thread.post.exp
@@ -11,7 +11,7 @@ status: process terminated by SIGSEGV (Segmentation Fault), addr=........
 %fs = 0x........            %esi = 0x00000105 
 %gs = 0x........            %edi = 0x00000106 
 
- %eip = 0x........  coredump_single_thread`inner+0x........
+ %eip = 0x........  inner+0x........
 %kesp = 0x00000000
 
 
@@ -20,7 +20,7 @@ status: process terminated by SIGSEGV (Segmentation Fault), addr=........
    %err = 0x0
 
 ---Stack trace---
-coredump_single_thread`inner
-coredump_single_thread`outer
-coredump_single_thread`main
-coredump_single_thread`_start
+inner
+outer
+main
+_start