From: Vincent Pit <vince@profvince.com>
Date: Sat, 26 Sep 2009 07:13:09 +0000 (+0200)
Subject: Move the --xml option to Parser::XML
X-Git-Tag: v1.11~13
X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FTest-Valgrind.git;a=commitdiff_plain;h=5e79efb82cb666170d0433e927acb2048031ce34

Move the --xml option to Parser::XML
---

diff --git a/lib/Test/Valgrind/Parser/XML.pm b/lib/Test/Valgrind/Parser/XML.pm
index 0e92e18..3f4cdbe 100644
--- 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 fef177a..c1ec7e1 100644
--- 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(@_);