You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2010/03/16 05:53:36 UTC
svn commit: r923579 - in /perl/embperl/trunk: Changes.pod test.pl
test/cmp/errdoc2.htm test/cmp/error.htm
Author: richter
Date: Tue Mar 16 04:53:36 2010
New Revision: 923579
URL: http://svn.apache.org/viewvc?rev=923579&view=rev
Log:
Adaption of tests to changed error messages of perl 5.10
Modified:
perl/embperl/trunk/Changes.pod
perl/embperl/trunk/test.pl
perl/embperl/trunk/test/cmp/errdoc2.htm
perl/embperl/trunk/test/cmp/error.htm
Modified: perl/embperl/trunk/Changes.pod
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Changes.pod?rev=923579&r1=923578&r2=923579&view=diff
==============================================================================
--- perl/embperl/trunk/Changes.pod (original)
+++ perl/embperl/trunk/Changes.pod Tue Mar 16 04:53:36 2010
@@ -5,6 +5,7 @@
- Increased size limit for errormessage from 1024 to 4096
- Makefile.PL can now handle compiling 32Bit code on 64Bit
sytsem if Perl was compiled as 32Bit application
+ - Adaption of tests to changed error messages of perl 5.10
=head1 2.3.1
Modified: perl/embperl/trunk/test.pl
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=923579&r1=923578&r2=923579&view=diff
==============================================================================
--- perl/embperl/trunk/test.pl (original)
+++ perl/embperl/trunk/test.pl Tue Mar 16 04:53:36 2010
@@ -70,6 +70,14 @@
'errors' => 5,
'version' => 2,
'cgi' => 0,
+ 'condition' => '$] < 5.010000',
+ },
+ 'error.htm' => {
+ 'repeat' => 3,
+ 'errors' => 6,
+ 'version' => 2,
+ 'cgi' => 0,
+ 'condition' => '$] >= 5.010000',
},
'error.htm' => {
'repeat' => 3,
@@ -83,7 +91,14 @@
'errors' => 6,
'version' => 2,
'cgi' => 1,
- 'condition' => '$MP2',
+ 'condition' => '$MP2 && $] < 5.010000',
+ },
+ 'error.htm' => {
+ 'repeat' => 3,
+ 'errors' => 7,
+ 'version' => 2,
+ 'cgi' => 1,
+ 'condition' => '$MP2 && $] >= 5.010000',
},
'errormismatch.htm' => {
'errors' => '1',
@@ -119,6 +134,14 @@
'errors' => 5,
'version' => 2,
'modperl' => 1,
+ 'condition' => '$] < 5.010000',
+ },
+ 'errdoc/errdoc.htm' => {
+ 'option' => '262144',
+ 'errors' => 6,
+ 'version' => 2,
+ 'modperl' => 1,
+ 'condition' => '$] >= 5.010000',
},
'errdoc/epl/errdoc2.htm' => {
'option' => '262144',
@@ -135,6 +158,16 @@
'cgi' => 0,
'noloop' => 1,
'modperl' => 1,
+ 'condition' => '$] < 5.010000',
+ },
+ 'errdoc/epl/errdoc2.htm' => {
+ 'option' => '262144',
+ 'errors' => 6,
+ 'version' => 2,
+ 'cgi' => 0,
+ 'noloop' => 1,
+ 'modperl' => 1,
+ 'condition' => '$] >= 5.010000',
},
'rawinput/rawinput.htm' => {
'option' => '16',
@@ -2278,7 +2311,7 @@ do
}) ;
$t_exec += 0 ; # Embperl::Clock () - $t1 ;
- $err = CheckError ($EP2?5:8) if ($err == 0) ;
+ $err = CheckError ($EP2?($] >= 5.010000?6:5):8) if ($err == 0) ;
if (@errors != ($EP2?4:12))
{
Modified: perl/embperl/trunk/test/cmp/errdoc2.htm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/cmp/errdoc2.htm?rev=923579&r1=923578&r2=923579&view=diff
==============================================================================
--- perl/embperl/trunk/test/cmp/errdoc2.htm (original)
+++ perl/embperl/trunk/test/cmp/errdoc2.htm Tue Mar 16 04:53:36 2010
@@ -24,7 +24,8 @@ next:
^syntax error at
^syntax error at
^syntax error at
-^}"</td></tr>
+^}"
+^-Missing right curly or square bracket at
</table>
</body>
Modified: perl/embperl/trunk/test/cmp/error.htm
URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/cmp/error.htm?rev=923579&r1=923578&r2=923579&view=diff
==============================================================================
--- perl/embperl/trunk/test/cmp/error.htm (original)
+++ perl/embperl/trunk/test/cmp/error.htm Tue Mar 16 04:53:36 2010
@@ -32,6 +32,7 @@ The server encountered an internal error
^<br>
^-<br>
^-<br> }
+^-<br> Missing right curly or square bracket at
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
</td></tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org