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 2005/03/14 14:41:46 UTC
cvs commit: embperl/test/cmp epoerrdoc2.htm escape.htm
richter 2005/03/14 05:41:45
Modified: . Changes.pod Makefile.PL test.pl
test/cmp epoerrdoc2.htm escape.htm
Log:
- Find apr.h if it is not in same directory as httpd.h in
Makefile.PL. (Necessary for RedHat)
- epoerrdoc2 tests
Revision Changes Path
1.269 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- Changes.pod 12 Mar 2005 13:46:07 -0000 1.268
+++ Changes.pod 14 Mar 2005 13:41:45 -0000 1.269
@@ -44,6 +44,8 @@
file that is called via Execute. Reported by Michael Smith.
- Fixed segfault when requesting symbol tables informations
via Apache::Status, reported by Dan Wilga.
+ - Find apr.h if it is not in same directory as httpd.h in
+ Makefile.PL. (Necessary for RedHat)
=head1 2.0rc2 21. November 2004
1.76 +7 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- Makefile.PL 15 Jan 2005 20:17:26 -0000 1.75
+++ Makefile.PL 14 Mar 2005 13:41:45 -0000 1.76
@@ -733,6 +733,12 @@
$i = "-I$inc_dir -I$apache_src/regex -I$apache_src/os/unix" ;
$o = '' ;
}
+
+ if ($mp2cfg && !-f "$inc_dir/apr.h")
+ {
+ $i .= " -I$mp2cfg->{apr_includedir}" ;
+ }
+
$d .= ' -DAPACHE' ;
$d .= ' -DAPACHE2' if ($mp2cfg) ;
$EPNOAPACHELIB = 0 ;
1.156 +9 -6 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- test.pl 3 Mar 2005 07:37:05 -0000 1.155
+++ test.pl 14 Mar 2005 13:41:45 -0000 1.156
@@ -20,6 +20,7 @@
# version =>
# errors =>
+# noerrtest =>
# sleep4err =>
# query_string =>
# repeat =>
@@ -787,10 +788,12 @@
'cgi' => 0,
'errors' => 1,
},
+
'EmbperlObject/errdoc/epoerrdoc2.htm' => {
'offline' => 0,
'cgi' => 0,
- 'errors' => 8,
+ 'errors' => 4, # 4-8
+ 'noerrtest' => 1,
},
'EmbperlObject/epobase.htm' => {
'offline' => 0,
@@ -1665,7 +1668,7 @@
sub CheckError
{
- my ($cnt) = @_ ;
+ my ($cnt, $noerrtest) = @_ ;
my $err = 0 ;
my $ic ;
@@ -1688,7 +1691,7 @@
# because RedHat excapes newlines in error log
my @cnt = split /(?:\\n(?!ot))+/ ;
$cnt -= @cnt ;
- if ($cnt < 0)
+ if ($cnt < 0 && !$noerrtest)
{
print "\n\n" if ($cnt == -1) ;
print "[$cnt]$_\n" if (!defined ($opt_ab) || !(/Warn/));
@@ -2012,7 +2015,7 @@
}
$errin = $err ;
- $err = CheckError ($errcnt) if ($err == 0 || ($errcnt > 0 && $err == 500) || $file eq 'notfound.htm' || $file eq 'notallow.xhtm') ;
+ $err = CheckError ($errcnt, $test -> {noerrtest}) if ($err == 0 || ($errcnt > 0 && $err == 500) || $file eq 'notfound.htm' || $file eq 'notallow.xhtm') ;
if ($err == 0 && $errin != 500 && $file ne 'notfound.htm' && $file ne 'notallow.xhtm')
@@ -2845,7 +2848,7 @@
#$errcnt++ if (($loc eq $cgiloc || $loc eq $fastcgiloc) && $file eq 'notallow.xhtm') ;
sleep ($test->{sleep4err}) if ($test->{sleep4err}) ;
sleep (1) if (($loc eq $cgiloc || $loc eq $fastcgiloc) && $errcnt) ;
- $err = CheckError ($errcnt) if (($err == 0 || $file eq 'notfound.htm' || $file eq 'notallow.xhtm')) ;
+ $err = CheckError ($errcnt, $test -> {noerrtest}) if (($err == 0 || $file eq 'notfound.htm' || $file eq 'notallow.xhtm')) ;
if ($err == 0 && $file ne 'notfound.htm' && $file ne 'notallow.xhtm' && !defined ($opt_ab))
{
$page =~ /.*\/(.*)$/ ;
1.2 +8 -11 embperl/test/cmp/epoerrdoc2.htm
Index: epoerrdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epoerrdoc2.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- epoerrdoc2.htm 3 Mar 2005 07:37:05 -0000 1.1
+++ epoerrdoc2.htm 14 Mar 2005 13:41:45 -0000 1.2
@@ -9,24 +9,21 @@
main:
-^prev: Apache=SCALAR\(0x
+^prev: Apache(?:::RequestRec)?=SCALAR\(0x
next:
-There are 4 errormessages:
+^There are (2|4) errormessages:
<table border=1>
-^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: \(in cleanup\) Can't locate bad_module_without_name.pm
-^BEGIN failed--compilation aborted
-
+^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: \(in cleanup\) Can't locate bad_module_without_name.pm
+^-BEGIN failed--compilation aborted
^ <tr><td>\[\d+\]ERR: 24: Error in Perl code: Can't locate bad_module_without_name.pm in
^BEGIN failed--compilation aborted
-^BEGIN failed--compilation aborted at
-
-^ <tr><td>\[\d+\]ERR: 32: Warning in Perl code: \(in cleanup\) Can't locate bad_module_without_name.pm
-^BEGIN failed--compilation aborted
-
+^-BEGIN fa
+^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: \(in cleanup\) Can't locate bad_module_without_name.pm
+^-BEGIN failed--compilation aborted
^ <tr><td>\[\d+\]ERR: 24: Error in Perl code: Can't locate bad_module_without_name.pm
^BEGIN failed--compilation aborted
-^BEGIN failed--compilation aborted
+^-BEGIN failed
</table>
</body>
1.33 +1 -1 embperl/test/cmp/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/escape.htm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- escape.htm 15 Jan 2005 19:53:59 -0000 1.32
+++ escape.htm 14 Mar 2005 13:41:45 -0000 1.33
@@ -49,7 +49,7 @@
^<a href=\"tst.html\?(par1=1|par2=2)&(par1=1|par2=2)\">1<\/a>
-<a href="tst.html?par1=1&par2=2&par3=3">2</a>
+^<a href=\"tst.html\?(par1=1&par2=2|par2=2&par1=1)&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>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org