Move the --xml option to Parser::XML

diff --git a/lib/Test/Valgrind/Parser/XML.pm b/lib/Test/Valgrind/Parser/XML.pm
index 0e92e18595b1ada02250e9cda811af5afe16349a..3f4cdbebbcb8ceb1c71b391bf567d8cdd72d7b1f 100644 (file)
--- a/lib/Test/Valgrind/Parser/XML.pm
+++ b/lib/Test/Valgrind/Parser/XML.pm
@@ -39,6 +39,7 @@ sub args {
 
  return (
   $self->SUPER::args(@_),
+  '--xml=yes',
   $fd_opt . fileno($fh),
  );
 }

diff --git a/lib/Test/Valgrind/Tool/memcheck.pm b/lib/Test/Valgrind/Tool/memcheck.pm
index fef177a5f5c296e0abfcf95585c1efd60d7dc911..c1ec7e1093029883c87689e22a942e48842b8f62 100644 (file)
--- a/lib/Test/Valgrind/Tool/memcheck.pm
+++ b/lib/Test/Valgrind/Tool/memcheck.pm
@@ -118,10 +118,8 @@ sub args {
   '--error-limit=yes',
  );
 
- unless ($sess->do_suppressions) {
-  push @args, '--track-origins=yes' if $sess->version ge '3.4.0';
-  push @args, '--xml=yes';
- }
+ push @args, '--track-origins=yes' if  $sess->version ge '3.4.0'
+                                   and not $sess->do_suppressions;
 
  push @args, $self->SUPER::args(@_);