richter 01/04/27 00:40:33
Modified: . Changes.pod Embperl.pm test.pl
test/cmp escape.htm includeerr1.htm includeerr2.htm
Log:
- adapted make test to Perl 5.6.1 so now it passes sucessfully.
Revision Changes Path
1.159 +1 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- Changes.pod 2001/04/27 06:37:50 1.158
+++ Changes.pod 2001/04/27 07:40:22 1.159
@@ -27,6 +27,7 @@
- ';' is now escaped to %3B when outputed inside a URL.
- Embperl is now added to the Serversoftware identification when
preloaded under mod_perl.
+ - adapted make test to Perl 5.6.1 so now it passes sucessfully.
=head1 1.3.1 (RELEASE) 13 Feb. 2001
1.147 +11 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- Embperl.pm 2001/04/27 06:37:51 1.146
+++ Embperl.pm 2001/04/27 07:40:23 1.147
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.146 2001/04/27 06:37:51 richter Exp $
+# $Id: Embperl.pm,v 1.147 2001/04/27 07:40:23 richter Exp $
#
###################################################################################
@@ -51,6 +51,16 @@
%udat
%mdat
@ffld
+ %fsplitdat
+ %idat
+
+ $tabmode
+ $escmode
+ $row
+ $cnt
+ $col
+ $maxrow
+ $maxcol
$evalpackage
1.99 +36 -0 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- test.pl 2001/04/27 06:38:03 1.98
+++ test.pl 2001/04/27 07:40:24 1.99
@@ -3,6 +3,21 @@
# `make test'. After `make install' it should work as `perl test.pl'
+# version =>
+# errors =>
+# query_string =>
+# repeat =>
+# cmpext =>
+# option =>
+# debug =>
+# cgi =>
+# offline =>
+# modperl =>
+# package =>
+# compartment =>
+# cookie =>
+# condition =>
+
@testdata = (
'ascii' => { },
'pure.htm' => { },
@@ -315,6 +330,16 @@
'compartment'=> 'TEST',
'version' => 1,
'cgi' => 0,
+ 'condition' => '$] < 5.006001',
+ },
+ 'opmask/opmasktrap.htm' => {
+ 'option' => '12',
+ 'errors' => '1',
+ 'compartment'=> 'TEST',
+ 'version' => 1,
+ 'cgi' => 0,
+ 'condition' => '$] >= 5.006001',
+ 'cmpext' => '.561',
},
'mdatsess.htm' => {
'offline' => 0,
@@ -1231,6 +1256,11 @@
next if ($DProf && ($file =~ /safe/)) ;
next if ($DProf && ($file =~ /opmask/)) ;
+
+ if (exists ($test -> {condition}))
+ {
+ next if (!eval ($test -> {condition})) ;
+ }
$errcnt = $test -> {errors} || 0 ;
$errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
@@ -1290,6 +1320,7 @@
$org = "$cmppath/$1" ;
$org = "$cmppath$testversion/$1" if (-e "$cmppath$testversion/$1")
;
$org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0)
;
+ $org .= $test -> {cmpext} if ($test -> {cmpext}) ;
#$org .= '-1' if ($ep1compat && -e "$org-1") ;
$err = CmpFiles ($outfile, $org, $errin) ;
@@ -1865,6 +1896,11 @@
next if (defined ($opt_ab) && $test -> {'errors'}) ;
+ if (exists ($test -> {condition}))
+ {
+ next if (!eval ($test -> {condition})) ;
+ }
+
=pod
next if ($file =~ /\// && $loc eq $cgiloc) ;
1.23 +2 -2 embperl/test/cmp/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/escape.htm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- escape.htm 2001/03/09 06:21:39 1.22
+++ escape.htm 2001/04/27 07:40:28 1.23
@@ -44,9 +44,9 @@
Array in A <a href="http://localhost/tests?X=9&Y=8&Z=7";>
Hash in H <a href="http://localhost/tests?A=1&B=2";>
-Array in H <a href="http://localhost/tests?X=9&Y=8&Z=7";>
+^Array in H \<a
href\=\"http\:\/\/localhost\/tests\?(X=9&Y=8&Z=7)|(Z=7&X=9&Y=8)\"\>
-<a href="tst.html?par1=1&par2=2">1</a>
+^<a href="tst.html\?(par1=1&par2=2)|(par2=2&par1=1)">1</a>
<a href="tst.html?par1=1&par2=2&par3=3">2</a>
<a href="tst.html?par1=1&par2=2">3</a>
<a href="tst.html?par1=1&par2=2&par3=3">4</a>
1.5 +1 -1 embperl/test/cmp/includeerr1.htm
Index: includeerr1.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/includeerr1.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- includeerr1.htm 2000/10/17 07:02:10 1.4
+++ includeerr1.htm 2001/04/27 07:40:28 1.5
@@ -2,7 +2,7 @@
<H1>Internal Server Error</H1>
The server encountered an internal error or misconfiguration and was unable to
complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error
occurred\, and anything you might have done that may have caused the error
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?includeerr1.htm line 10
+^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here"
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
1.6 +6 -6 embperl/test/cmp/includeerr2.htm
Index: includeerr2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/includeerr2.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- includeerr2.htm 2000/10/17 07:02:10 1.5
+++ includeerr2.htm 2001/04/27 07:40:29 1.6
@@ -3,14 +3,14 @@
The server encountered an internal error or misconfiguration and was unable to
complete your request.<P>
^Please contact the server administrator\,.*?and inform them of the time the error
occurred\, and anything you might have done that may have caused the error
^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
-^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here" at .*?incerr.htm line 6
+^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here"
+^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here"
+^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
+^-\[.*?\]ERR\: 24\: Line \d+\: Error in Perl code: Can't locate object method
"is" via package "here"
^-\[.*?\]ERR\: 32\: Line \d+\: Warning in Perl code: Use of uninitialized value
^ HTML\:\:Embperl.*?<P>
</BODY></HTML>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
