richter 00/11/16 21:30:49
Modified: . Changes.pod Embperl.pm Embperl.xs test.pl
test/cmp epodiv.htm
test/conf httpd.conf.src
Log:
- Corrected a wrong test, that let make test fail. Spotted by Eddie Lau.
Revision Changes Path
1.144 +9 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- Changes.pod 2000/11/15 08:48:21 1.143
+++ Changes.pod 2000/11/17 05:30:48 1.144
@@ -1,5 +1,14 @@
=pod
+=head1 1.3b8_dev -- That's what currently under developement
+
+Last Update: <$localtime$> (MET)
+
+NOTE: This version is only available via L<"CVS"|CVS/"INTRO">
+
+ - Corrected a wrong test, that let make test fail. Spotted by Eddie Lau.
+
+
=head1 1.3b7 (BETA) 15. Nov 2000
- Fixed problem that call to close triggers error in Session.pm when using
Store::File.
1.134 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- Embperl.pm 2000/11/15 08:48:21 1.133
+++ Embperl.pm 2000/11/17 05:30:48 1.134
@@ -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.133 2000/11/15 08:48:21 richter Exp $
+# $Id: Embperl.pm,v 1.134 2000/11/17 05:30:48 richter Exp $
#
###################################################################################
@@ -83,7 +83,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '1.3b7';
+$VERSION = '1.3b8_dev';
##ep2## $VERSION = '2.0a7';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
1.37 +8 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Embperl.xs 2000/11/08 07:49:07 1.36
+++ Embperl.xs 2000/11/17 05:30:48 1.37
@@ -33,6 +33,14 @@
OUTPUT:
RETVAL
+int
+embperl_XS_Test(n)
+ int n
+CODE:
+ RETVAL = n ;
+OUTPUT:
+ RETVAL
+
1.86 +26 -12 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- test.pl 2000/11/15 08:15:41 1.85
+++ test.pl 2000/11/17 05:30:48 1.86
@@ -466,7 +466,7 @@
$opt_offline $opt_ep1 $opt_cgi $opt_modperl $opt_execute $opt_nokill
$opt_loop
$opt_multchild $opt_memcheck $opt_exitonmem $opt_exitonsv $opt_config
$opt_nostart $opt_uniquefn
$opt_quite $opt_ignoreerror $opt_tests $opt_blib $opt_help
$opt_dbgbreak $opt_finderr
- $opt_ddd $opt_gdb $opt_ab $opt_start $opt_kill $opt_showcookie
$opt_cache) ;
+ $opt_ddd $opt_gdb $opt_ab $opt_abpre $opt_abverbose $opt_start
$opt_kill $opt_showcookie $opt_cache) ;
{
local $^W = 0 ;
@@ -541,7 +541,7 @@
$ret = GetOptions ("offline|o", "ep1|1", "cgi|c", "cache|a", "modperl|httpd|h",
"execute|e", "nokill|r", "loop|l:i",
"multchild|m", "memcheck|v", "exitonmem|g", "exitonsv", "config|f=s",
"nostart|x", "uniquefn|u",
"quite|q", "ignoreerror|i", "tests|t", "blib|b", "help", "dbgbreak",
"finderr",
- "ddd", "gdb", "ab:s", "start", "kill", "showcookie") ;
+ "ddd", "gdb", "ab:s", "abverbose", "abpre", "start", "kill", "showcookie")
;
$opt_help = 1 if ($ret == 0) ;
@@ -607,7 +607,9 @@
# print "-b use uninstalled version (from blib/..)\n" ;
print "--ddd start apache under ddd\n" ;
print "--gdb start apache under gdb\n" ;
- print "--ab <numreq> run test thru ApacheBench\n" ;
+ print "--ab <numreq|options> run test thru ApacheBench\n" ;
+ print "--abverbose show whole ab output\n" ;
+ print "--abpre prefetch first request\n" ;
print "--start start apache only\n" ;
print "--kill kill apache only\n" ;
print "--showcookie shows sent and received cookies\n" ;
@@ -1030,7 +1032,7 @@
$looptest = defined ($opt_loop)?1:0 ; # endless loop tests
$outfile .= ".$$" if ($opt_uniquefn) ;
-$defaultdebug = 0 if ($opt_quite) ;
+$defaultdebug = 1 if ($opt_quite) ;
$opt_ep1 = 0 if (!$EP2) ;
$EP1COMPAT = 1 if ($opt_ep1) ;
@@ -1061,7 +1063,10 @@
}
else
{
- @tests = @ARGV ;
+ @tests = () ;
+ @testdata = () ;
+ my $i = 0 ;
+ @testdata = map { push @tests, $i ; $i+=2 ; ($_ => {}) } @ARGV ;
}
}
@@ -1422,7 +1427,7 @@
}
}
- if ($EP2)
+ if ($EP2 && $opt_cache)
{
#############
#
@@ -1773,7 +1778,8 @@
(!$test -> {cgi} && ($test -> {offline} || $test ->
{modperl})))) ;
-
+ next if (defined ($opt_ab) && $test -> {'errors'}) ;
+
=pod
next if ($file =~ /\// && $loc eq $cgiloc) ;
next if ($file eq 'taint.htm' && $loc eq $cgiloc) ;
@@ -1857,10 +1863,18 @@
$file .= '-1' if ($opt_ep1 && -e "$page-1") ;
if (defined ($opt_ab))
{
+ $m = REQ ("$loc$locver", $file, $test -> {query_info}, $outfile,
$content, $upload, $test -> {cookie}) if ($opt_abpre) ;
+ $locver ||= '' ;
$opt_ab = 10 if (!$opt_ab) ;
- my $cmd = "ab -n $opt_ab
'http://$host:$port/$loc$locver/$file?$test->{query_info}'";
- print "$cmd\n" ;
- system ($cmd) and die "Cannot start ab ($!)" ;
+ my $cmd = "ab -n $opt_ab 'http://$host:$port/$loc$locver/$file" .
($test->{query_info}?"?$test->{query_info}'":"'") ;
+ print "$cmd\n" if ($opt_abverbose) ;
+
+ open AB, "$cmd|" or die "Cannot start ab ($!)" ;
+ while (<AB>)
+ {
+ print $_ if ($opt_abverbose || (/Requests/)) ;
+ }
+ close AB ;
}
else
{
@@ -1879,7 +1893,7 @@
CheckSVs ($loopcnt, $n) ;
}
- if (($m || '') ne 'ok' && $errcnt == 0)
+ if (($m || '') ne 'ok' && $errcnt == 0 && !$opt_ab)
{
$err = 1 ;
print "ERR:$m\n" ;
@@ -1901,7 +1915,7 @@
$err = CmpFiles ($outfile, $org) ;
}
- print "ok\n" unless ($err) ;
+ print "ok\n" unless ($err || $opt_ab) ;
$err = 0 if ($opt_ignoreerror) ;
last if ($err) ;
$n++ ;
1.3 +1 -1 embperl/test/cmp/epodiv.htm
Index: epodiv.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epodiv.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epodiv.htm 2000/11/07 11:28:31 1.2
+++ epodiv.htm 2000/11/17 05:30:48 1.3
@@ -280,7 +280,7 @@
</tr>
</table>
-<P>1.3b7_dev<P>
+^<P>1\.3
<P>17<P>
<P>1<P>
1.30 +6 -1 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- httpd.conf.src 2000/11/15 08:15:42 1.29
+++ httpd.conf.src 2000/11/17 05:30:49 1.30
@@ -55,7 +55,6 @@
print OFH "SetEnv EMBPERL_ESCMODE 3\n" ;
}
-
if ($EPSESSIONVERSION)
{
print OFH <<EOD ;
@@ -343,6 +342,12 @@
<Location /eg>
SetHandler perl-script
PerlHandler HTML::Embperl
+Options ExecCGI
+</Location>
+
+<Location /mp>
+SetHandler perl-script
+PerlHandler "sub { print 'Hello' }"
Options ExecCGI
</Location>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
