From: Ivo Raisr <ivosh@ivosh.net>
Date: Tue, 15 Dec 2015 10:43:25 +0000 (+0000)
Subject: Fix expected stderr on Solaris for memcheck/tests/gone_abrt_xml.
X-Git-Tag: svn/VALGRIND_3_12_0~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=719b0574ea399c2d60750e3b61ef526d3bff2456;p=thirdparty%2Fvalgrind.git

Fix expected stderr on Solaris for memcheck/tests/gone_abrt_xml.
On Solaris, the stack frame looks like:
  <stack>
    <frame>
      <ip>0x........</ip>
      <obj>/lib/amd64/libc.so.1</obj>
      <fn>kill</fn>
    </frame>
    <frame>
      <ip>0x........</ip>
      <obj>.../gdbserver_tests/gone</obj>
      <fn>(below main)</fn>
    </frame>
  </stack>

because Solaris libc does not currently contain DWARF CFI and
stack unwinder gets only return address from _start().



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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 2e4b243864..231e23f9ac 100644
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -125,6 +125,7 @@ EXTRA_DIST = \
 	fprw.stderr.exp fprw.stderr.exp-mips32-be fprw.stderr.exp-mips32-le \
 		fprw.vgtest \
 	fwrite.stderr.exp fwrite.vgtest fwrite.stderr.exp-kfail \
+	gone_abrt_xml.vgtest gone_abrt_xml.stderr.exp gone_abrt_xml.stderr.exp-solaris \
 	holey_buffer_too_small.vgtest holey_buffer_too_small.stdout.exp \
 	holey_buffer_too_small.stderr.exp \
 	inits.stderr.exp inits.vgtest \
@@ -259,6 +260,8 @@ EXTRA_DIST = \
 	    test-plo-yes.stderr.exp-le64 test-plo-yes.stderr.exp-le32 \
 	    test-plo-no.stderr.exp-s390x-mvc \
 	thread_alloca.stderr.exp thread_alloca.vgtest \
+	threadname.vgtest threadname.stderr.exp \
+	threadname_xml.vgtest threadname_xml.stderr.exp \
 	trivialleak.stderr.exp trivialleak.vgtest trivialleak.stderr.exp2 \
 	undef_malloc_args.stderr.exp undef_malloc_args.vgtest \
 	unit_libcbase.stderr.exp unit_libcbase.vgtest \
@@ -295,10 +298,7 @@ EXTRA_DIST = \
 	wrapmallocstatic.vgtest wrapmallocstatic.stdout.exp \
 	wrapmallocstatic.stderr.exp \
 	writev1.stderr.exp writev1.stderr.exp-solaris writev1.vgtest \
-	xml1.stderr.exp xml1.stdout.exp xml1.vgtest xml1.stderr.exp-s390x-mvc \
-	threadname.vgtest threadname.stderr.exp \
-	threadname_xml.vgtest threadname_xml.stderr.exp \
-	gone_abrt_xml.vgtest gone_abrt_xml.stderr.exp
+	xml1.stderr.exp xml1.stdout.exp xml1.vgtest xml1.stderr.exp-s390x-mvc
 
 check_PROGRAMS = \
 	accounting \
diff --git a/memcheck/tests/gone_abrt_xml.stderr.exp-solaris b/memcheck/tests/gone_abrt_xml.stderr.exp-solaris
new file mode 100644
index 0000000000..db2109f4df
--- /dev/null
+++ b/memcheck/tests/gone_abrt_xml.stderr.exp-solaris
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<valgrindoutput>
+
+<protocolversion>4</protocolversion>
+<protocoltool>memcheck</protocoltool>
+
+<preamble>
+  <line>...</line>
+  <line>...</line>
+  <line>...</line>
+  <line>...</line>
+</preamble>
+
+<pid>...</pid>
+<ppid>...</ppid>
+<tool>memcheck</tool>
+
+<args>
+  <vargv>...</vargv>
+  <argv>
+    <exe>./../../gdbserver_tests/gone</exe>
+    <arg>abort</arg>
+  </argv>
+</args>
+
+<status>
+  <state>RUNNING</state>
+  <time>...</time>
+</status>
+
+starting ...
+aborting ...
+<fatal_signal>
+  <tid>...</tid>
+  <signo>6</signo>
+  <signame>SIGABRT</signame>
+  <sicode>0</sicode>
+  <stack>
+    <frame>
+      <ip>0x........</ip>
+      <obj>...</obj>
+      <fn>(below main)</fn>
+    </frame>
+  </stack>
+</fatal_signal>
+
+
+<status>
+  <state>FINISHED</state>
+  <time>...</time>
+</status>
+
+<errorcounts>
+</errorcounts>
+
+<suppcounts>...</suppcounts>
+
+</valgrindoutput>
+