From: Ivo Raisr <ivosh@ivosh.net>
Date: Sun, 7 Feb 2016 23:59:41 +0000 (+0000)
Subject: Exclude 'threading model' information from Solaris coredump tests
X-Git-Tag: svn/VALGRIND_3_12_0~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2811d9dff6214d46305878c706e9d7fab028d8ea;p=thirdparty%2Fvalgrind.git

Exclude 'threading model' information from Solaris coredump tests

Solaris 12 transitioned to public libproc and mdb now prints
'raw lwps' instead of 'native threads' for the threading model.
This information is irrelevant for coredump generation and analysis;
therefore leave it out.
n-i-bz


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

diff --git a/none/tests/amd64-solaris/coredump_single_thread.post.exp b/none/tests/amd64-solaris/coredump_single_thread.post.exp
index a5aa542ba7..10f46dfeb2 100644
--- a/none/tests/amd64-solaris/coredump_single_thread.post.exp
+++ b/none/tests/amd64-solaris/coredump_single_thread.post.exp
@@ -1,7 +1,6 @@
 ---Status---
 debugging core file of coredump_single (64-bit) from ...
 initial argv: ./coredump_single_thread
-threading model: native threads
 status: process terminated by SIGSEGV (Segmentation Fault), addr=........
 
 ---Registers---
diff --git a/none/tests/amd64-solaris/coredump_single_thread_mdb b/none/tests/amd64-solaris/coredump_single_thread_mdb
index 00b864f3b4..082d78a665 100755
--- a/none/tests/amd64-solaris/coredump_single_thread_mdb
+++ b/none/tests/amd64-solaris/coredump_single_thread_mdb
@@ -7,6 +7,7 @@ echo "---Status---"
 echo "::status" | /usr/bin/mdb vgcore.* | \
 perl -p -e 's/from \S*$/from .../' | \
 perl -0 -p -e 's/^file: .+?^(initial argv:)/$1/ms' | \
+sed '/^threading model:/ d' | \
 perl -p -e 's/addr=[0-9A-Fa-f]+/addr=......../g'
 
 echo "\n---Registers---"
diff --git a/none/tests/amd64-solaris/coredump_single_thread_sse.post.exp b/none/tests/amd64-solaris/coredump_single_thread_sse.post.exp
index 9840da5dad..01acc712e4 100644
--- a/none/tests/amd64-solaris/coredump_single_thread_sse.post.exp
+++ b/none/tests/amd64-solaris/coredump_single_thread_sse.post.exp
@@ -1,7 +1,6 @@
 ---Status---
 debugging core file of coredump_single (64-bit) from ...
 initial argv: ./coredump_single_thread_sse
-threading model: native threads
 status: process terminated by SIGSEGV (Segmentation Fault), addr=........
 
 ---SSE Registers---
diff --git a/none/tests/amd64-solaris/coredump_single_thread_sse_mdb b/none/tests/amd64-solaris/coredump_single_thread_sse_mdb
index 3cc5413da3..8d8f5503d2 100755
--- a/none/tests/amd64-solaris/coredump_single_thread_sse_mdb
+++ b/none/tests/amd64-solaris/coredump_single_thread_sse_mdb
@@ -7,6 +7,7 @@ echo "---Status---"
 echo "::status" | /usr/bin/mdb vgcore.* | \
 perl -p -e 's/from \S*$/from .../' | \
 perl -0 -p -e 's/^file: .+?^(initial argv:)/$1/ms' | \
+sed '/^threading model:/ d' | \
 perl -p -e 's/addr=[0-9A-Fa-f]+/addr=......../g'
 
 echo "\n---SSE Registers---"
diff --git a/none/tests/x86-solaris/coredump_single_thread.post.exp b/none/tests/x86-solaris/coredump_single_thread.post.exp
index 407f7acb49..34d45fa548 100644
--- a/none/tests/x86-solaris/coredump_single_thread.post.exp
+++ b/none/tests/x86-solaris/coredump_single_thread.post.exp
@@ -1,7 +1,6 @@
 ---Status---
 debugging core file of coredump_single (32-bit) from ...
 initial argv: ./coredump_single_thread
-threading model: native threads
 status: process terminated by SIGSEGV (Segmentation Fault), addr=........
 
 ---Registers---
diff --git a/none/tests/x86-solaris/coredump_single_thread_mdb b/none/tests/x86-solaris/coredump_single_thread_mdb
index c500478f3b..b0053c60e6 100755
--- a/none/tests/x86-solaris/coredump_single_thread_mdb
+++ b/none/tests/x86-solaris/coredump_single_thread_mdb
@@ -7,6 +7,7 @@ echo "---Status---"
 echo "::status" | /usr/bin/mdb vgcore.* | \
 perl -p -e 's/from \S*$/from .../' | \
 perl -0 -p -e 's/^file: .+?^(initial argv:)/$1/ms' | \
+sed '/^threading model:/ d' | \
 perl -p -e 's/addr=[0-9A-Fa-f]+/addr=......../g'
 
 echo "\n---Registers---"
diff --git a/none/tests/x86-solaris/coredump_single_thread_sse.post.exp b/none/tests/x86-solaris/coredump_single_thread_sse.post.exp
index d42da8ade9..97d8781010 100644
--- a/none/tests/x86-solaris/coredump_single_thread_sse.post.exp
+++ b/none/tests/x86-solaris/coredump_single_thread_sse.post.exp
@@ -1,7 +1,6 @@
 ---Status---
 debugging core file of coredump_single (32-bit) from ...
 initial argv: ./coredump_single_thread_sse
-threading model: native threads
 status: process terminated by SIGSEGV (Segmentation Fault), addr=........
 
 ---SSE Registers---
diff --git a/none/tests/x86-solaris/coredump_single_thread_sse_mdb b/none/tests/x86-solaris/coredump_single_thread_sse_mdb
index 3cc5413da3..8d8f5503d2 100755
--- a/none/tests/x86-solaris/coredump_single_thread_sse_mdb
+++ b/none/tests/x86-solaris/coredump_single_thread_sse_mdb
@@ -7,6 +7,7 @@ echo "---Status---"
 echo "::status" | /usr/bin/mdb vgcore.* | \
 perl -p -e 's/from \S*$/from .../' | \
 perl -0 -p -e 's/^file: .+?^(initial argv:)/$1/ms' | \
+sed '/^threading model:/ d' | \
 perl -p -e 's/addr=[0-9A-Fa-f]+/addr=......../g'
 
 echo "\n---SSE Registers---"