regtest PPC: update a few XML expecteds after bug390310

diff --git a/drd/tests/bar_bad_xml.stderr.exp b/drd/tests/bar_bad_xml.stderr.exp
index c6150b8995afbd1abd014328f700f126f8614012..603492527cf45e7bedef48cb5213020e4c66444b 100644 (file)
--- a/drd/tests/bar_bad_xml.stderr.exp
+++ b/drd/tests/bar_bad_xml.stderr.exp
@@ -204,7 +204,6 @@ destroy a barrier that has waiting threads
 
 
 destroy a barrier that was never initialised
-
 <status>
   <state>FINISHED</state>
   <time>...</time>

diff --git a/helgrind/tests/filter_xml b/helgrind/tests/filter_xml
index e9475f04a216e8a953af5dfb9c38e9d014c663d3..0dc77f7a44907889fcb58769a2fa75165c978aa9 100755 (executable)
--- a/helgrind/tests/filter_xml
+++ b/helgrind/tests/filter_xml
@@ -41,6 +41,7 @@ my %patterns = (
     "Using Valgrind-([^\\s]*)"    => "X.Y.X",
     "Copyright \\(C\\) ([0-9]{4}-[0-9]{4}).*" => "XXXX-YYYY",
     '<fn>pthread_.*(@\*)</fn>'                => "",
+    "<suppressed>(.*)</suppressed>" => "...",
     "<suppressed_contexts>(.*)</suppressed_contexts>" => "..."
 );
 

diff --git a/helgrind/tests/tc06_two_races_xml.stderr.exp b/helgrind/tests/tc06_two_races_xml.stderr.exp
index 800ef543f43f8d257ae5cba960d7fe2de846e671..8948505a73f4b70ade3ae7dce781e815ea1b3c0d 100644 (file)
--- a/helgrind/tests/tc06_two_races_xml.stderr.exp
+++ b/helgrind/tests/tc06_two_races_xml.stderr.exp
@@ -257,7 +257,7 @@
 <error_summary>
   <errors>4</errors>
   <error_contexts>4</error_contexts>
-  <suppressed>7</suppressed>
+  <suppressed>...</suppressed>
   <suppressed_contexts>...</suppressed_contexts>
 </error_summary>
 

diff --git a/helgrind/tests/tc06_two_races_xml.stderr.exp-freebsd b/helgrind/tests/tc06_two_races_xml.stderr.exp-freebsd
index 724649cb6fa65d9e38eceb364cf0aad47f074c56..e8cda5ff60f958bbc59a3ddc9cac3b582f37dbd0 100644 (file)
--- a/helgrind/tests/tc06_two_races_xml.stderr.exp-freebsd
+++ b/helgrind/tests/tc06_two_races_xml.stderr.exp-freebsd
@@ -249,7 +249,7 @@
 <error_summary>
   <errors>4</errors>
   <error_contexts>4</error_contexts>
-  <suppressed>7</suppressed>
+  <suppressed>...</suppressed>
   <suppressed_contexts>...</suppressed_contexts>
 </error_summary>
 

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 18924b34f3ee381eec2db822a15ab2820cb24d6f..ca01f9e42da91f1e2a25576b80cd4ecdc7f09559 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -158,6 +158,7 @@ EXTRA_DIST = \
        fdleak_fcntl.stderr.exp fdleak_fcntl.vgtest \
        fdleak_fcntl_xml.stderr.exp fdleak_fcntl_xml.vgtest \
        fdleak_ipv4.stderr.exp fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \
+       fdleak_ipv4_xml.stderr.exp-ppc64be \
        fdleak_ipv4_xml.stderr.exp-ppc64le \
        fdleak_ipv4_xml.stderr.exp fdleak_ipv4_xml.stdout.exp \
        fdleak_ipv4_xml.vgtest fdleak_ipv4_xml.stderr.exp-nomain \

diff --git a/none/tests/fdleak_ipv4_xml.stderr.exp-ppc64be b/none/tests/fdleak_ipv4_xml.stderr.exp-ppc64be
new file mode 100644 (file)
index 0000000..204592a
--- /dev/null
+++ b/none/tests/fdleak_ipv4_xml.stderr.exp-ppc64be
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+
+<valgrindoutput>
+
+<protocolversion>6</protocolversion>
+<protocoltool>none</protocoltool>
+
+<preamble>
+  <line>Nulgrind, the minimal Valgrind tool</line>
+  <line>Copyright...</line>
+  <line>Using Valgrind...</line>
+  <line>Command: ./fdleak_ipv4</line>
+</preamble>
+
+<pid>...</pid>
+<ppid>...</ppid>
+<tool>none</tool>
+
+<args>
+  <vargv>
+    <exe>...</exe>
+    <arg>--command-line-only=yes</arg>
+    <arg>--memcheck:leak-check=no</arg>
+    <arg>--tool=none</arg>
+    <arg>--track-fds=yes</arg>
+    <arg>--xml=yes</arg>
+    <arg>--xml-fd=2</arg>
+    <arg>--child-silent-after-fork=yes</arg>
+  </vargv>
+  <argv>
+    <exe>...</exe>
+  </argv>
+</args>
+
+<status>
+  <state>RUNNING</state>
+  <time>...</time>
+</status>
+
+<error>
+  <unique>0x........</unique>
+  <tid>...</tid>
+  <kind>FdBadClose</kind>
+  <fd>4</fd>
+  <what>...</what>
+  <stack>
+    <frame>
+      <ip>0x........</ip>
+      <obj>...</obj>
+      <fn>client</fn>
+      <dir>...</dir>
+      <file>fdleak_ipv4.c</file>
+      <line>70</line>
+    </frame>
+  </stack>
+  <auxwhat>Previously closed</auxwhat>
+  <stack>
+    <frame>
+      <ip>0x........</ip>
+      <obj>...</obj>
+      <fn>client</fn>
+      <dir>...</dir>
+      <file>fdleak_ipv4.c</file>
+      <line>69</line>
+    </frame>
+  </stack>
+  <auxwhat>Originally opened</auxwhat>
+  <stack>
+    <frame>
+      <ip>0x........</ip>
+      <obj>...</obj>
+      <fn>client</fn>
+      <dir>...</dir>
+      <file>fdleak_ipv4.c</file>
+      <line>68</line>
+    </frame>
+  </stack>
+</error>
+
+<status>
+  <state>FINISHED</state>
+  <time>...</time>
+</status>
+
+<error>
+  <unique>0x........</unique>
+  <tid>...</tid>
+  <kind>FdNotClosed</kind>
+  <fd>3</fd>
+  <what>...</what>
+  <stack>
+    <frame>
+      <ip>0x........</ip>
+      <obj>...</obj>
+      <fn>client</fn>
+      <dir>...</dir>
+      <file>fdleak_ipv4.c</file>
+      <line>51</line>
+    </frame>
+    <frame>
+      <ip>0x........</ip>
+      <obj>...</obj>
+      <fn>main</fn>
+      <dir>...</dir>
+      <file>fdleak_ipv4.c</file>
+      <line>90</line>
+    </frame>
+  </stack>
+</error>
+
+<errorcounts>
+  <pair>
+    <count>1</count>
+    <unique>0x........</unique>
+  </pair>
+</errorcounts>
+
+<suppcounts>
+</suppcounts>
+
+<error_summary>
+  <errors>2</errors>
+  <error_contexts>2</error_contexts>
+  <suppressed>0</suppressed>
+  <suppressed_contexts>0</suppressed_contexts>
+</error_summary>
+
+</valgrindoutput>

diff --git a/none/tests/file_dclose_xml.stderr.exp-nomain b/none/tests/file_dclose_xml.stderr.exp-nomain
index 6c5406c0320743a37a543e9f6a4dc5f200142688..bd424eaed9a1094bef9bc0ef4c2e2a1ca076c017 100644 (file)
--- a/none/tests/file_dclose_xml.stderr.exp-nomain
+++ b/none/tests/file_dclose_xml.stderr.exp-nomain
@@ -80,7 +80,6 @@ time passes and we close 3 again
   </stack>
 </error>
 
-
 <status>
   <state>FINISHED</state>
   <time>...</time>
@@ -93,6 +92,4 @@ time passes and we close 3 again
   </pair>
 </errorcounts>
 
-
 </valgrindoutput>
-