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 a5aa542ba7d947d9b70208477db3fa81583a4c3a..10f46dfeb22dac80b79028222ab695042f4620c4 100644 (file)
--- 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 00b864f3b42b5569a5d69fa52b4687bccf19eb32..082d78a6658db173499f9da3c3a42c5aff3c178f 100755 (executable)
--- 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 9840da5dad57a202db80c8dde2476fdec4b1d484..01acc712e4c1894f12b89241386d2d2d4ea326ef 100644 (file)
--- 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 3cc5413da3ab252e09cc987a9fc01dc9eb435cdc..8d8f5503d29843915cb9b57bd3ea9a1dff5e732f 100755 (executable)
--- 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 407f7acb490851569c2d015f9c09e0efdc019809..34d45fa548ad00c857824bc31b1f9481bbc17e0b 100644 (file)
--- 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 c500478f3b11f05d1afe4e966ee7260d79d06c9e..b0053c60e600ee02b1730e19c11eb394ee0b8fd5 100755 (executable)
--- 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 d42da8ade936ec73a5450118e1efe57f6e7243ff..97d878101038dce49a486cf09a98a504b0830569 100644 (file)
--- 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 3cc5413da3ab252e09cc987a9fc01dc9eb435cdc..8d8f5503d29843915cb9b57bd3ea9a1dff5e732f 100755 (executable)
--- 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---"