Menu
▾
▴
[Valgrind-developers] [valgrind] regtest PPC: update a few XML expecteds after bug390310
|
From: Paul F. <pa...@so...> - 2025-05-26 06:23:59
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=6dd49fc455dbf0310eef9de6067e47fac0ce92b8 commit 6dd49fc455dbf0310eef9de6067e47fac0ce92b8 Author: Paul Floyd <pj...@wa...> Date: Mon May 26 08:21:23 2025 +0200 regtest PPC: update a few XML expecteds after bug390310 Diff: --- drd/tests/bar_bad_xml.stderr.exp | 1 - helgrind/tests/filter_xml | 1 + helgrind/tests/tc06_two_races_xml.stderr.exp | 2 +- .../tests/tc06_two_races_xml.stderr.exp-freebsd | 2 +- none/tests/Makefile.am | 1 + none/tests/fdleak_ipv4_xml.stderr.exp-ppc64be | 128 +++++++++++++++++++++ none/tests/file_dclose_xml.stderr.exp-nomain | 3 - 7 files changed, 132 insertions(+), 6 deletions(-) diff --git a/drd/tests/bar_bad_xml.stderr.exp b/drd/tests/bar_bad_xml.stderr.exp index c6150b8995..603492527c 100644 --- 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 e9475f04a2..0dc77f7a44 100755 --- 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 800ef543f4..8948505a73 100644 --- 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 724649cb6f..e8cda5ff60 100644 --- 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 18924b34f3..ca01f9e42d 100644 --- 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 index 0000000000..204592a557 --- /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 6c5406c032..bd424eaed9 100644 --- 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> - |
