[librrd-simple-perl] 01/10: Update patch rrd-test-cdp-prep for Perl 5.22.

gregor herrmann gregoa at debian.org
Mon Jun 29 19:41:40 UTC 2015


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository librrd-simple-perl.

commit 107029fed7d36d221989bb86a33948da77dee816
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jun 29 21:24:05 2015 +0200

    Update patch rrd-test-cdp-prep for Perl 5.22.
    
    Negative infinity is output as "-Inf" now, not as "-inf". Calculate it in
    the test data to get the expected output.
    
    Closes: #790337
---
 debian/patches/rrd-test-cdp-prep | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/rrd-test-cdp-prep b/debian/patches/rrd-test-cdp-prep
index 4e4e8c8..843cfbe 100644
--- a/debian/patches/rrd-test-cdp-prep
+++ b/debian/patches/rrd-test-cdp-prep
@@ -6,8 +6,8 @@ Newer versions of RRDs include a new cur_row field in the output and
 seem to use a slightly different calculation for cdp_prep.  The version
 threshold here is just a guess and needs more research to be accurate.
 
---- librrd-simple-perl.orig/t/32exported_function_interface.t
-+++ librrd-simple-perl/t/32exported_function_interface.t
+--- a/t/32exported_function_interface.t
++++ b/t/32exported_function_interface.t
 @@ -55,6 +55,12 @@
  	}
  
@@ -21,8 +21,8 @@ threshold here is just a guess and needs more research to be accurate.
  	cmp_deeply(
  			$info->{rra},
  			$rra,
---- librrd-simple-perl.orig/t/answers.pl
-+++ librrd-simple-perl/t/answers.pl
+--- a/t/answers.pl
++++ b/t/answers.pl
 @@ -41,7 +41,66 @@
  
  @schemes = keys %retention_periods;
@@ -68,21 +68,21 @@ threshold here is just a guess and needs more research to be accurate.
 +       {
 +	       'xff'	     => '0.5',
 +	       'pdp_per_row' => 6,
-+	       'cdp_prep'    => -inf,
++	       'cdp_prep'    => 0+'-inf',
 +	       'cf'	     => 'MAX',
 +	       'rows'	     => 800
 +       },
 +       {
 +	       'xff'	     => '0.5',
 +	       'pdp_per_row' => 24,
-+	       'cdp_prep'    => -inf,
++	       'cdp_prep'    => 0+'-inf',
 +	       'cf'	     => 'MAX',
 +	       'rows'	     => 800
 +       },
 +       {
 +	       'xff'	     => '0.5',
 +	       'pdp_per_row' => 288,
-+	       'cdp_prep'    => -inf,
++	       'cdp_prep'    => 0+'-inf',
 +	       'cf'	     => 'MAX',
 +	       'rows'	     => 800
 +       }];
@@ -96,7 +96,7 @@ threshold here is just a guess and needs more research to be accurate.
  		'cf'          => 'MAX',
  		'rows'        => 800
 -	}];
-+	}] if $RRD::Simple::VERSION < 1.33;
++	}] if $RRD::Simple::VERSION < 1.40;
  
  # Old default values for 1.32
  $rra = [

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/librrd-simple-perl.git



More information about the Pkg-perl-cvs-commits mailing list