r44246 - in /trunk/libembperl-perl: debian/patches/perl5.10.patch debian/patches/series test.pl test/cmp/errdoc2.htm test/cmp/error.htm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Fri Sep 18 16:42:50 UTC 2009
Author: gregoa
Date: Fri Sep 18 16:42:45 2009
New Revision: 44246
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44246
Log:
split out patch for 468237 into a proper patch
Added:
trunk/libembperl-perl/debian/patches/perl5.10.patch
Modified:
trunk/libembperl-perl/debian/patches/series
trunk/libembperl-perl/test.pl
trunk/libembperl-perl/test/cmp/errdoc2.htm
trunk/libembperl-perl/test/cmp/error.htm
Added: trunk/libembperl-perl/debian/patches/perl5.10.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/perl5.10.patch?rev=44246&op=file
==============================================================================
--- trunk/libembperl-perl/debian/patches/perl5.10.patch (added)
+++ trunk/libembperl-perl/debian/patches/perl5.10.patch Fri Sep 18 16:42:45 2009
@@ -1,0 +1,108 @@
+From: Niko Tyni <ntyni at debian.org>
+Bug: #468237
+Subject: FTBFS with Perl 5.10 (failed tests)
+
+
+--- a/test.pl
++++ b/test.pl
+@@ -45,6 +45,7 @@
+ # input_escmode =>
+ # portadd =>
+
++my $newperl = ($] >= 5.009 ? 1 : 0);
+ @testdata = (
+ 'ascii' => { },
+ 'pure.htm' => {
+@@ -62,25 +63,25 @@
+ },
+ 'error.htm' => {
+ 'repeat' => 3,
+- 'errors' => 8,
++ 'errors' => 8+$newperl,
+ 'version' => 1,
+ },
+ 'error.htm' => {
+ 'repeat' => 3,
+- 'errors' => 5,
++ 'errors' => 5+$newperl,
+ 'version' => 2,
+ 'cgi' => 0,
+ },
+ 'error.htm' => {
+ 'repeat' => 3,
+- 'errors' => 5,
++ 'errors' => 5+$newperl,
+ 'version' => 2,
+ 'cgi' => 1,
+ 'condition' => '!$MP2',
+ },
+ 'error.htm' => {
+ 'repeat' => 3,
+- 'errors' => 6,
++ 'errors' => 6+$newperl,
+ 'version' => 2,
+ 'cgi' => 1,
+ 'condition' => '$MP2',
+@@ -110,19 +111,19 @@
+ },
+ 'errdoc/errdoc.htm' => {
+ 'option' => '262144',
+- 'errors' => 6,
++ 'errors' => 6+$newperl,
+ 'version' => 1,
+ 'cgi' => 0,
+ },
+ 'errdoc/errdoc.htm' => {
+ 'option' => '262144',
+- 'errors' => 5,
++ 'errors' => 5+$newperl,
+ 'version' => 2,
+ 'modperl' => 1,
+ },
+ 'errdoc/epl/errdoc2.htm' => {
+ 'option' => '262144',
+- 'errors' => 6,
++ 'errors' => 6+$newperl,
+ 'version' => 1,
+ 'cgi' => 0,
+ 'noloop' => 1,
+@@ -130,7 +131,7 @@
+ },
+ 'errdoc/epl/errdoc2.htm' => {
+ 'option' => '262144',
+- 'errors' => 5,
++ 'errors' => 5+$newperl,
+ 'version' => 2,
+ 'cgi' => 0,
+ 'noloop' => 1,
+@@ -2264,7 +2265,7 @@
+ }) ;
+ $t_exec += 0 ; # Embperl::Clock () - $t1 ;
+
+- $err = CheckError ($EP2?5:8) if ($err == 0) ;
++ $err = CheckError (($EP2?5:8)+$newperl) if ($err == 0) ;
+
+ if (@errors != ($EP2?4:12))
+ {
+--- a/test/cmp/errdoc2.htm
++++ b/test/cmp/errdoc2.htm
+@@ -24,7 +24,8 @@
+ ^syntax error at
+ ^syntax error at
+ ^syntax error at
+-^}"</td></tr>
++^}"(</td></tr>)?
++^-Missing right curly or square bracket at .*?errdoc2.htm line \d+, at end of line</td></tr>
+ </table>
+
+ </body>
+--- a/test/cmp/error.htm
++++ b/test/cmp/error.htm
+@@ -32,6 +32,7 @@
+ ^<br>
+ ^-<br>
+ ^-<br> }
++^-<br> Missing right curly or square bracket at .*?error.htm line \d+, at end of line
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ </td></tr>
+ </table>
Modified: trunk/libembperl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/series?rev=44246&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/patches/series (original)
+++ trunk/libembperl-perl/debian/patches/series Fri Sep 18 16:42:45 2009
@@ -1,1 +1,2 @@
cgi_pm.patch
+perl5.10.patch
Modified: trunk/libembperl-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/test.pl?rev=44246&op=diff
==============================================================================
--- trunk/libembperl-perl/test.pl (original)
+++ trunk/libembperl-perl/test.pl Fri Sep 18 16:42:45 2009
@@ -45,7 +45,6 @@
# input_escmode =>
# portadd =>
-my $newperl = ($] >= 5.009 ? 1 : 0);
@testdata = (
'ascii' => { },
'pure.htm' => {
@@ -63,25 +62,25 @@
},
'error.htm' => {
'repeat' => 3,
- 'errors' => 8+$newperl,
+ 'errors' => 8,
'version' => 1,
},
'error.htm' => {
'repeat' => 3,
- 'errors' => 5+$newperl,
+ 'errors' => 5,
'version' => 2,
'cgi' => 0,
},
'error.htm' => {
'repeat' => 3,
- 'errors' => 5+$newperl,
+ 'errors' => 5,
'version' => 2,
'cgi' => 1,
'condition' => '!$MP2',
},
'error.htm' => {
'repeat' => 3,
- 'errors' => 6+$newperl,
+ 'errors' => 6,
'version' => 2,
'cgi' => 1,
'condition' => '$MP2',
@@ -111,19 +110,19 @@
},
'errdoc/errdoc.htm' => {
'option' => '262144',
- 'errors' => 6+$newperl,
+ 'errors' => 6,
'version' => 1,
'cgi' => 0,
},
'errdoc/errdoc.htm' => {
'option' => '262144',
- 'errors' => 5+$newperl,
+ 'errors' => 5,
'version' => 2,
'modperl' => 1,
},
'errdoc/epl/errdoc2.htm' => {
'option' => '262144',
- 'errors' => 6+$newperl,
+ 'errors' => 6,
'version' => 1,
'cgi' => 0,
'noloop' => 1,
@@ -131,7 +130,7 @@
},
'errdoc/epl/errdoc2.htm' => {
'option' => '262144',
- 'errors' => 5+$newperl,
+ 'errors' => 5,
'version' => 2,
'cgi' => 0,
'noloop' => 1,
@@ -2265,7 +2264,7 @@
}) ;
$t_exec += 0 ; # Embperl::Clock () - $t1 ;
- $err = CheckError (($EP2?5:8)+$newperl) if ($err == 0) ;
+ $err = CheckError ($EP2?5:8) if ($err == 0) ;
if (@errors != ($EP2?4:12))
{
Modified: trunk/libembperl-perl/test/cmp/errdoc2.htm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/test/cmp/errdoc2.htm?rev=44246&op=diff
==============================================================================
--- trunk/libembperl-perl/test/cmp/errdoc2.htm (original)
+++ trunk/libembperl-perl/test/cmp/errdoc2.htm Fri Sep 18 16:42:45 2009
@@ -24,8 +24,7 @@
^syntax error at
^syntax error at
^syntax error at
-^}"(</td></tr>)?
-^-Missing right curly or square bracket at .*?errdoc2.htm line \d+, at end of line</td></tr>
+^}"</td></tr>
</table>
</body>
Modified: trunk/libembperl-perl/test/cmp/error.htm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/test/cmp/error.htm?rev=44246&op=diff
==============================================================================
--- trunk/libembperl-perl/test/cmp/error.htm (original)
+++ trunk/libembperl-perl/test/cmp/error.htm Fri Sep 18 16:42:45 2009
@@ -32,7 +32,6 @@
^<br>
^-<br>
^-<br> }
-^-<br> Missing right curly or square bracket at .*?error.htm line \d+, at end of line
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
</td></tr>
</table>
More information about the Pkg-perl-cvs-commits
mailing list