richter 00/09/13 13:00:58
Modified: . Tag: Embperl2c test.pl
test/cmp Tag: Embperl2c escraw.htm
test/html Tag: Embperl2c tagscandisable.htm
Added: test/cmp Tag: Embperl2c tagscandisable.htm
test/html Tag: Embperl2c inputdisable.htm
Log:
Embperl 2 Source Integration & Tests
Revision Changes Path
No revision
No revision
1.70.4.4 +26 -11 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.3
retrieving revision 1.70.4.4
diff -u -r1.70.4.3 -r1.70.4.4
--- test.pl 2000/09/13 19:17:22 1.70.4.3
+++ test.pl 2000/09/13 20:00:42 1.70.4.4
@@ -41,16 +41,28 @@
},
'noerr/noerrpage.htm' => {
'option' => 2,
- 'errors' => 7,
+ 'errors' => 8,
'version' => 1,
},
'errdoc/errdoc.htm' => {
'option' => '262144',
+ 'errors' => 6,
+ 'version' => 1,
+ },
+ 'errdoc/errdoc.htm' => {
+ 'option' => '262144',
'errors' => 7,
+ 'version' => 2,
},
'errdoc/epl/errdoc2.htm' => {
'option' => '262144',
+ 'errors' => 6,
+ 'version' => 1,
+ },
+ 'errdoc/epl/errdoc2.htm' => {
+ 'option' => '262144',
'errors' => 7,
+ 'version' => 2,
},
'rawinput/rawinput.htm' => {
'option' => '16',
@@ -1206,9 +1218,9 @@
$t_offline = 0 ;
$n_offline = 0 ;
$testnum = -1 + $startnumber ;
- foreach $ep1compat (0, 1)
+ foreach $ep1compat (($version == 2 && $opt_ep1)?(0, 1):(0))
{
- next if (($ep1compat && !($opt_ep1)) || (!$ep1compat &&
!($opt_offline)));
+ #next if (($ep1compat && !($opt_ep1)) || (!$ep1compat &&
!($opt_offline)));
$ENV{EMBPERL_EP1COMPAT} = $ep1compat ;
print "\nTesting Embperl 1.x compatibility mode...\n\n" if ($ep1compat) ;
@@ -1218,9 +1230,10 @@
$file = $testdata[$testno] ;
$test = $testdata[$testno+1] ;
$org = '' ;
+ $testversion = $version == 2 && !$ep1compat?2:1 ;
$testnum++ ;
- next if ($test->{version} && $version != $test->{version}) ;
+ next if ($test->{version} && $testversion != $test->{version}) ;
next if ((defined ($test -> {offline}) && $test -> {offline} == 0)
||
(!$test -> {offline} && ($test -> {modperl} || $test
-> {cgi} || $test -> {http}))) ;
@@ -1230,9 +1243,9 @@
$errcnt = $test -> {errors} || 0 ;
$errcnt = 7 if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
- $debug = $test -> {debug} || $defaultdebug ;
+ $debug = $test -> {debug} || $defaultdebug ;
$page = "$inpath/$file" ;
- $page = "$inpath$version/$file" if (-e "$inpath$version/$file") ;
+ $page = "$inpath$testversion/$file" if (-e
"$inpath$testversion/$file") ;
#$page .= '-1' if ($ep1compat && -e "$page-1") ;
$notseen = $seen{"o:$page"}?0:1 ;
@@ -1277,7 +1290,7 @@
{
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
- $org = "$cmppath$version/$1" if (-e "$cmppath$version/$1") ;
+ $org = "$cmppath$testversion/$1" if (-e "$cmppath$testversion/$1")
;
$org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0)
;
#$org .= '-1' if ($ep1compat && -e "$org-1") ;
@@ -1605,7 +1618,7 @@
print "without apache httpd installed.\n" ;
}
-
+ $ep1compat = 0 ;
while ($loc ne '' && $err == 0)
{
if ($loc eq $embploc)
@@ -1624,7 +1637,9 @@
$test = $testdata[$testno+1] ;
$org = '' ;
$testnum++ ;
- next if ($test->{version} && $version != $test->{version}) ;
+ $testversion = $version == 2 && !$ep1compat?2:1 ;
+
+ next if ($test->{version} && $testversion != $test->{version}) ;
next if ($loc eq $embploc &&
((defined ($test -> {modperl}) && $test -> {modperl} == 0) ||
(!$test -> {modperl} && ($test -> {offline} || $test ->
{cgi})))) ;
@@ -1671,7 +1686,7 @@
$debug = $test -> {debug} || $defaultdebug ;
$page = "$inpath/$file" ;
- $page = "$inpath$version/$file" if (-e "$inpath$version/$file") ;
+ $page = "$inpath$testversion/$file" if (-e "$inpath$testversion/$file")
;
if ($opt_nostart)
{
$notseen = 0 ;
@@ -1749,7 +1764,7 @@
{
$page =~ /.*\/(.*)$/ ;
$org = "$cmppath/$1" ;
- $org = "$cmppath$version/$1" if (-e "$cmppath$version/$1") ;
+ $org = "$cmppath$testversion/$1" if (-e "$cmppath$testversion/$1") ;
$org .= '56' if ($file eq 'varerr.htm' && $^V && $^V ge v5.6.0) ;
#$org .= '-1' if ($opt_ep1 && -e "$org-1") ;
No revision
No revision
1.1.2.2 +9 -0 embperl/test/cmp/Attic/escraw.htm
Index: escraw.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/Attic/escraw.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- escraw.htm 2000/09/13 18:13:49 1.1.2.1
+++ escraw.htm 2000/09/13 20:00:49 1.1.2.2
@@ -1,3 +1,12 @@
+
+<html>
+<head>
+<title>Some tests for Embperl escaping</title>
+</head>
+
+<body>
+
+
$optRawInput 0
$escmode 0
'here is a \ ' -> here is a \
No revision
No revision
1.1.2.1 +82 -0 embperl/test/cmp/Attic/tagscandisable.htm
No revision
No revision
1.1.2.2 +36 -7 embperl/test/html/Attic/tagscandisable.htm
Index: tagscandisable.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/Attic/tagscandisable.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- tagscandisable.htm 2000/09/13 18:14:17 1.1.2.1
+++ tagscandisable.htm 2000/09/13 20:00:55 1.1.2.2
@@ -21,24 +21,53 @@
<table>
<tr>
- <td>[+ $ks[$row] +]</td><td>[+ $idat{$ks[$row] || ''} +]</td>
+ <td>[+ $ks[$i=$row] +]</td><td>[+ $idat{$ks[$i]} || '<undef>'
+]</td>
</tr>
</table>
[- @ks = sort keys %fdat -]
- <table>
- <tr>
- <td>[+ $ks[$row] +]</td><td>[+ $fdat{$ks[$row] || ''} +]</td>
- </tr>
- </table>
+<table>
+ <tr>
+ <td>[+ $ks[$i=$row] +]</td><td>[+ $fdat{$ks[$i]} || '<undef>' +]</td>
+ </tr>
+</table>
optDisableHtmlScan is now: [+ $optDisableHtmlScan +] <BR>
optDisableHtmlScan is set now to: [+ $optDisableHtmlScan = 0 +] <BR>
optDisableHtmlScan is now: [+ $optDisableHtmlScan +] <BR>
+ [- @ks = sort keys %fdat -]
+
<table>
<tr>
- <td>[+ $ks[$row] +]</td><td>[+ $fdat{$ks[$row] || ''} +]</td>
+ <td>[+ $ks[$i=$row] +]</td><td>[+ $fdat{$ks[$i]} || '<undef>' +]</td>
</tr>
</table>
+
+ <input type="text" name="feld1" value="Wert1">
+ <input type="text" name="feld2">
+ <input type="text" size=10 name="feld3">
+ <input type="text" name="feld4" size=10>
+
+ <input type="text" name="feld5" value="Wert5">
+ <input type="text" name="feld6">
+ <input type="text" size=10 name="feld7">
+ <input type="text" name="feld8" size=10>
+
+ [- @ks = sort keys %idat -]
+
+ <table>
+ <tr>
+ <td>[+ $ks[$i=$row] +]</td><td>[+ $idat{$ks[$i]} || '<undef>'
+]</td>
+ </tr>
+ </table>
+
+ [- @ks = sort keys %fdat -]
+
+ <table>
+ <tr>
+ <td>[+ $ks[$i=$row] +]</td><td>[+ $fdat{$ks[$i]} || '<undef>'
+]</td>
+ </tr>
+ </table>
+
No revision
No revision
1.1.2.1 +224 -0 embperl/test/html/Attic/inputdisable.htm
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
