You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1999/12/30 21:34:34 UTC
cvs commit: modperl/t/net/perl request-cookie.pl request-param.pl request-upload.pl
dougm 99/12/30 12:34:33
Modified: lib/Apache test.pm
t/net/perl request-cookie.pl request-param.pl
request-upload.pl
Log:
fixups for yesterday's test fixups
Revision Changes Path
1.15 +9 -2 modperl/lib/Apache/test.pm
Index: test.pm
===================================================================
RCS file: /home/cvs/modperl/lib/Apache/test.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- test.pm 1999/12/30 01:49:52 1.14
+++ test.pm 1999/12/30 20:34:23 1.15
@@ -85,7 +85,14 @@
#so the next eval $mod succeeds, when it shouldnot
my %really_have = (
- 'Apache::Table' => sub { Apache::Table->can('TIEHASH') },
+ 'Apache::Table' => sub {
+ if ($ENV{MOD_PERL}) {
+ return Apache::Table->can('TIEHASH');
+ }
+ else {
+ return $net::callback_hooks{PERL_TABLE_API};
+ }
+ },
);
for (qw(Apache::Cookie Apache::Request)) {
@@ -126,7 +133,7 @@
return 0 unless $cv->();
}
- print "module $mod is installed\n";
+ print "module $mod is installed\n" unless $ENV{MOD_PERL};
return 1;
}
1.7 +4 -4 modperl/t/net/perl/request-cookie.pl
Index: request-cookie.pl
===================================================================
RCS file: /home/cvs/modperl/t/net/perl/request-cookie.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- request-cookie.pl 1999/07/01 18:48:04 1.6
+++ request-cookie.pl 1999/12/30 20:34:27 1.7
@@ -8,15 +8,15 @@
require CGI::Cookie;
};
-unless (Apache::Request->can('upload')) {
+my $r = shift;
+$r->send_http_header('text/plain');
+
+unless (have_module "Apache::Cookie" and Apache::Request->can('upload')) {
print "1..0\n";
print $@ if $@;
print "$INC{'Apache/Request.pm'}\n";
return;
}
-
-my $r = shift;
-$r->send_http_header('text/plain');
my $i = 0;
my $tests = 33;
1.2 +1 -1 modperl/t/net/perl/request-param.pl
Index: request-param.pl
===================================================================
RCS file: /home/cvs/modperl/t/net/perl/request-param.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- request-param.pl 1998/12/23 23:15:25 1.1
+++ request-param.pl 1999/12/30 20:34:28 1.2
@@ -8,7 +8,7 @@
require Apache::Request;
};
-unless (Apache::Request->can('upload')) {
+unless (have_module "Apache::Request" and Apache::Request->can('upload')) {
print "1..0\n";
print $@ if $@;
print "$INC{'Apache/Request.pm'}\n";
1.8 +1 -1 modperl/t/net/perl/request-upload.pl
Index: request-upload.pl
===================================================================
RCS file: /home/cvs/modperl/t/net/perl/request-upload.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- request-upload.pl 1998/12/30 20:50:32 1.7
+++ request-upload.pl 1999/12/30 20:34:28 1.8
@@ -8,7 +8,7 @@
require Apache::Request;
};
-unless (Apache::Request->can('upload')) {
+unless (have_module "Apache::Request" and Apache::Request->can('upload')) {
print "1..0\n";
print $@ if $@;
print "$INC{'Apache/Request.pm'}\n";