Bug#468237: libembperl-perl: FTBFS with Perl 5.10 (failed tests)

[Niko Tyni]

On Fri, Mar 14, 2008 at 09:48:27PM +0200, Niko Tyni wrote:
> tag 468237 patch
> thanks

> The attached rather crude patch seems to catch all the problematic places,

Argh, there was a leftover full path to my build directory in there. Here's an
updated version.

Cheers,
-- 
Niko Tyni   [EMAIL PROTECTED]

diff --git a/test.pl b/test.pl
index 4c6ede0..21a6767 100644
--- 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,
@@ -2263,7 +2264,7 @@ do
                 				}) ;
 		$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))
                     {
diff --git a/test/cmp/errdoc2.htm b/test/cmp/errdoc2.htm
index 7304cd0..c344796 100755
--- a/test/cmp/errdoc2.htm
+++ b/test/cmp/errdoc2.htm
@@ -24,7 +24,8 @@ next:
 ^syntax error at 
 ^syntax error at 
 ^syntax error at 
-^}&quot;</td></tr>
+^}&quot;(</td></tr>)?
+^-Missing right curly or square bracket at .*?errdoc2.htm line \d+, at end of line</td></tr>
 </table>
 
 </body>
diff --git a/test/cmp/error.htm b/test/cmp/error.htm
index ed1e66b..c34c9f7 100755
--- a/test/cmp/error.htm
+++ b/test/cmp/error.htm
@@ -32,6 +32,7 @@ The server encountered an internal error or misconfiguration and was unable to c
 ^<br>&nbsp;&nbsp;&nbsp;&nbsp;                                
 ^-<br>&nbsp;&nbsp;&nbsp;&nbsp;                                
 ^-<br>&nbsp;&nbsp;&nbsp;&nbsp;}
+^-<br>&nbsp;&nbsp;&nbsp;&nbsp;Missing right curly or square bracket at .*?error.htm line \d+, at end of line
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 </td></tr>
 </table>