r15826 - in /trunk/libapache2-mod-perl2/debian: changelog patches/013-test-apache-status.patch patches/series

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Wed Feb 27 21:02:16 2008
New Revision: 15826

URL: http://svn.debian.org/wsvn/?sc=1&rev=15826
Log:
  + 013-test-apache-status.patch: make the apache_status.t test work with
    Perl 5.10 too. Upstream SVN r614146.

Added:
    trunk/libapache2-mod-perl2/debian/patches/013-test-apache-status.patch
Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/series

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/changelog?rev=15826&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Wed Feb 27 21:02:16 2008
@@ -1,7 +1,4 @@
 libapache2-mod-perl2 (2.0.3-3) UNRELEASED; urgency=low
-
-  TODO: one test failure with Perl 5.10
-   t/modules/apache_status.................# Failed test 1 in t/modules/apache_status.t at line 26
 
   [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -37,6 +34,8 @@
       as they had not been applied since 2.0.3-1.
     + 010-svn-fix-bleadperl.patch: more Perl 5.10 fixes from upstream SVN.
     + 012-svn-more-perl5.10-fixes.patch: as above.
+    + 013-test-apache-status.patch: make the apache_status.t test work with
+      Perl 5.10 too. Upstream SVN r614146.
 
  -- Niko Tyni <ntyni at debian.org>  Wed, 27 Feb 2008 22:15:01 +0200
 

Added: trunk/libapache2-mod-perl2/debian/patches/013-test-apache-status.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/013-test-apache-status.patch?rev=15826&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/013-test-apache-status.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/013-test-apache-status.patch Wed Feb 27 21:02:16 2008
@@ -1,0 +1,22 @@
+Fix the test to work with Perl 5.10 too.
+Stolen from upstream SVN r614146.
+
+--- libapache2-mod-perl2.orig/t/modules/apache_status.t
++++ libapache2-mod-perl2/t/modules/apache_status.t
+@@ -18,13 +18,9 @@
+ {
+     my $url = "$base_url";
+     my $body = GET_BODY_ASSERT $url;
+-    (my $pver = $]) =~ s/00//;
+-    $pver =~ s/(\d\.\d)(.*)/"$1." . ($2 ? int($2) : 0)/e;
+-    #t_debug $body;
+-    t_debug $pver;
+-    # expecting: Embedded Perl version v5.8.2 for ...
+-    ok $body =~ /$pver/;
+-
++    # expecting: Embedded Perl version <b>v5.8.2</b> for ...
++    my $pver = $^V ? sprintf "v%vd", $^V : $];
++    ok t_cmp($body, qr[Embedded Perl version <b>$pver</b> for]);
+     # menu_item, part 1
+     # expecting: Test Entry
+     ok $body =~ /Test Menu Entry/;

Modified: trunk/libapache2-mod-perl2/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/series?rev=15826&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/series (original)
+++ trunk/libapache2-mod-perl2/debian/patches/series Wed Feb 27 21:02:16 2008
@@ -7,3 +7,4 @@
 010-svn-fix-bleadperl.patch
 011-svn-fix-perl5.10-build.patch
 012-svn-more-perl5.10-fixes.patch 
+013-test-apache-status.patch