svn commit: r1407830 - in /perl/embperl/trunk: Makefile.PL test.pl test/cmp/errorfirstrun.htm test/html/errorfirstrun.htm

[richter]

Author: richter
Date: Sat Nov 10 15:13:21 2012
New Revision: 1407830

URL: http://svn.apache.org/viewvc?rev=1407830&view=rev
Log:
Fix tests

Modified:
    perl/embperl/trunk/Makefile.PL
    perl/embperl/trunk/test.pl
    perl/embperl/trunk/test/cmp/errorfirstrun.htm
    perl/embperl/trunk/test/html/errorfirstrun.htm

Modified: perl/embperl/trunk/Makefile.PL
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/Makefile.PL?rev=1407830&r1=1407829&r2=1407830&view=diff
==============================================================================
--- perl/embperl/trunk/Makefile.PL (original)
+++ perl/embperl/trunk/Makefile.PL Sat Nov 10 15:13:21 2012
@@ -15,7 +15,7 @@ use Data::Dumper ;
 
 $win32 = ($Config{osname} =~ /win32/i) ;
 $aix = ($Config{osname} =~ /aix/i);
-$perl32bit = $Config{ptrsize} == 4 && ($Config{archname} =~ /^x86_64/) ;
+$perl32bit = $Config{ptrsize} == 4 && ($Config{archname} =~ /^i\d86/) ;
 $dynlib = {};
 print "\nRunning on Win 32\n" if ($win32) ;
 

Modified: perl/embperl/trunk/test.pl
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1407830&r1=1407829&r2=1407830&view=diff
==============================================================================
--- perl/embperl/trunk/test.pl (original)
+++ perl/embperl/trunk/test.pl Sat Nov 10 15:13:21 2012
@@ -110,8 +110,14 @@
         'version'    => 2,
         },
     'errorfirstrun.htm' => { 
-        'errors'     => '1',
+        'errors'     => 1,
+        'version'    => 2,
+        'condition'  => '$] < 5.006000',
+        },
+    'errorfirstrun.htm' => { 
+        'errors'     => 2,
         'version'    => 2,
+        'condition'  => '$] >= 5.006000',
         },
     'unclosed.htm' => { 
         'errors'     => '1',

Modified: perl/embperl/trunk/test/cmp/errorfirstrun.htm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/test/cmp/errorfirstrun.htm?rev=1407830&r1=1407829&r2=1407830&view=diff
==============================================================================
--- perl/embperl/trunk/test/cmp/errorfirstrun.htm (original)
+++ perl/embperl/trunk/test/cmp/errorfirstrun.htm Sat Nov 10 15:13:21 2012
@@ -5,7 +5,12 @@ The server encountered an internal error
 <table cellspacing='2' cellpadding='5'>
 <tr bgcolor='#eeeeee'><td>
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-^\[\d+\]ERR:  24:  Error in Perl code: Global symbol \&quot;\$x\&quot; 
requires explicit package name at
+^\[\d+\]ERR:.+in Perl code: Global symbol \&quot;\$x\&quot; requires explicit 
package name at
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+</td></tr>
+<tr bgcolor='#eeeeee'><td>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+^\[\d+\]ERR:  24:  Error in Perl code: syntax error at .+errorfirstrun.htm 
line 10
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 </td></tr>
 </table>

Modified: perl/embperl/trunk/test/html/errorfirstrun.htm
URL: 
http://svn.apache.org/viewvc/perl/embperl/trunk/test/html/errorfirstrun.htm?rev=1407830&r1=1407829&r2=1407830&view=diff
==============================================================================
--- perl/embperl/trunk/test/html/errorfirstrun.htm (original)
+++ perl/embperl/trunk/test/html/errorfirstrun.htm Sat Nov 10 15:13:21 2012
@@ -5,3 +5,8 @@ sub test
     $x = 1;
 }
 !]
+[!
+
+5 +
+
+!]
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org