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 st...@apache.org on 2004/07/03 20:45:46 UTC
cvs commit: modperl-2.0/t/response/TestModperl taint.pm
stas 2004/07/03 11:45:46
Modified: ModPerl-Registry/t 500.t cgi.t
t/apache scanhdrs.t scanhdrs2.t
t/filter out_init_basic.t
t/filter/TestFilter out_str_eval.pm
t/hooks/TestHooks push_handlers_same_phase.pm
t/modperl exit.t status.t
t/modules cgi.t cgi2.t include.t include2.t
t/response/TestAPI rutil.pm server_util.pm show.pm
slurp_filename.pm uri.pm
t/response/TestAPR bucket.pm flatten.pm ipsubnet.pm pool.pm
t/response/TestApache util.pm
t/response/TestDirective perldo.pm perlloadmodule.pm
t/response/TestError api.pm
t/response/TestModperl taint.pm
Log:
swap the 1st and 2nd arguments order in t_cmp calls when qr// is used, to
fit the new A-T API
Revision Changes Path
1.10 +4 -5 modperl-2.0/ModPerl-Registry/t/500.t
Index: 500.t
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/500.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- 500.t 18 Sep 2003 06:43:45 -0000 1.9
+++ 500.t 3 Jul 2004 18:45:45 -0000 1.10
@@ -83,9 +83,8 @@
);
# the error message is attached after the body
- ok t_cmp(
- qr/some body.*The server encountered an internal error/ms,
- $res->content,
- "200, followed by a runtime error",
- );
+ ok t_cmp($res->content,
+ qr/some body.*The server encountered an internal error/ms,
+ "200, followed by a runtime error",
+ );
}
1.3 +6 -10 modperl-2.0/ModPerl-Registry/t/cgi.t
Index: cgi.t
===================================================================
RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/cgi.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- cgi.t 28 May 2003 01:48:47 -0000 1.2
+++ cgi.t 3 Jul 2004 18:45:45 -0000 1.3
@@ -10,14 +10,10 @@
my $url = "/registry/cgi.pl";
my $res = GET $url;
-ok t_cmp(
- qr{^text/html},
- $res->header('Content-type'),
- "test 'Content-type header setting"
- );
+ok t_cmp($res->header('Content-type'),
+ qr{^text/html},
+ "test 'Content-type header setting");
-ok t_cmp(
- '<b>done</b>',
- lc($res->content),
- "test body"
- );
+ok t_cmp(lc($res->content),
+ '<b>done</b>',
+ "test body");
1.7 +2 -2 modperl-2.0/t/apache/scanhdrs.t
Index: scanhdrs.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/apache/scanhdrs.t,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- scanhdrs.t 12 Apr 2004 21:52:10 -0000 1.6
+++ scanhdrs.t 3 Jul 2004 18:45:45 -0000 1.7
@@ -14,7 +14,7 @@
t_debug $res->as_string;
-ok t_cmp(qr/^ok 1$/m, $res->content);
+ok t_cmp($res->content, qr/^ok 1$/m);
ok t_cmp('text/test-output',
$res->header('Content-Type'),
@@ -24,4 +24,4 @@
$res->header('X-Perl-Module'),
"custom header");
-ok t_cmp(qr/beer/, $res->message);
+ok t_cmp($res->message, qr/beer/);
1.5 +1 -1 modperl-2.0/t/apache/scanhdrs2.t
Index: scanhdrs2.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/apache/scanhdrs2.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- scanhdrs2.t 20 Aug 2003 06:02:30 -0000 1.4
+++ scanhdrs2.t 3 Jul 2004 18:45:45 -0000 1.5
@@ -30,5 +30,5 @@
ok t_cmp(200, $res->code,
"status == 200");
-ok t_cmp(qr{welcome to}, $res->content,
+ok t_cmp($res->content, qr{welcome to},
"content is index.html");
1.4 +1 -1 modperl-2.0/t/filter/out_init_basic.t
Index: out_init_basic.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/out_init_basic.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- out_init_basic.t 24 Apr 2003 01:57:41 -0000 1.3
+++ out_init_basic.t 3 Jul 2004 18:45:46 -0000 1.4
@@ -14,4 +14,4 @@
my $location = '/TestFilter__out_init_basic';
my $response = POST_BODY $location, content => $content;
-ok t_cmp(qr/^$expected/, $response, "test filter init functionality");
+ok t_cmp($response, qr/^$expected/, "test filter init functionality");
1.3 +1 -1 modperl-2.0/t/filter/TestFilter/out_str_eval.pm
Index: out_str_eval.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/out_str_eval.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- out_str_eval.pm 24 Jun 2004 17:35:00 -0000 1.2
+++ out_str_eval.pm 3 Jul 2004 18:45:46 -0000 1.3
@@ -32,7 +32,7 @@
# trigger the filter invocation, before using $@
$r->print("# whatever");
$r->rflush;
- ok t_cmp(qr/Undefined subroutine/, $@, "some croak");
+ ok t_cmp($@, qr/Undefined subroutine/, "some croak");
return Apache::OK;
}
1.2 +1 -1 modperl-2.0/t/hooks/TestHooks/push_handlers_same_phase.pm
Index: push_handlers_same_phase.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/push_handlers_same_phase.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- push_handlers_same_phase.pm 9 Feb 2004 19:08:35 -0000 1.1
+++ push_handlers_same_phase.pm 3 Jul 2004 18:45:46 -0000 1.2
@@ -49,7 +49,7 @@
# once running inside the response phase it shouldn't be possible
# to switch from 'perl-script' to 'modperl' and vice versa
eval { $r->handler("perl-script") };
- ok t_cmp(qr/Can't switch from/, $@,
+ ok t_cmp($@, qr/Can't switch from/,
"can't switch from 'perl-script' to 'modperl' inside " .
"the response phase");
1.4 +4 -4 modperl-2.0/t/modperl/exit.t
Index: exit.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/exit.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- exit.t 25 May 2004 16:23:56 -0000 1.3
+++ exit.t 3 Jul 2004 18:45:46 -0000 1.4
@@ -18,12 +18,12 @@
{
my $exit_excpt = ModPerl::EXIT;
my $body = GET_BODY_ASSERT("$location?eval");
- ok t_cmp(qr/^ModPerl::Util::exit: \($exit_excpt\) exit was called/,
- $body,
+ ok t_cmp($body,
+ qr/^ModPerl::Util::exit: \($exit_excpt\) exit was called/,
"exit in eval context");
- ok !t_cmp(qr/must not be reached/,
- $body,
+ ok !t_cmp($body,
+ qr/must not be reached/,
"exit in eval context");
}
1.4 +2 -2 modperl-2.0/t/modperl/status.t
Index: status.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/status.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- status.t 20 Oct 2003 19:37:29 -0000 1.3
+++ status.t 3 Jul 2004 18:45:46 -0000 1.4
@@ -103,8 +103,8 @@
$response->code,
$uri);
- ok t_cmp(qr/server encountered an internal error/,
- $response->content,
+ ok t_cmp($response->content,
+ qr/server encountered an internal error/,
$uri);
}
1.12 +2 -2 modperl-2.0/t/modules/cgi.t
Index: cgi.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modules/cgi.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- cgi.t 22 Nov 2003 21:37:14 -0000 1.11
+++ cgi.t 3 Jul 2004 18:45:46 -0000 1.12
@@ -44,8 +44,8 @@
sok {
my $header = 'Content-type';
$res = GET $location;
- t_cmp(qr{^text/test-output},
- $res->header($header),
+ t_cmp($res->header($header),
+ qr{^text/test-output},
"$header header");
};
1.2 +2 -2 modperl-2.0/t/modules/cgi2.t
Index: cgi2.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modules/cgi2.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- cgi2.t 7 Nov 2003 08:52:44 -0000 1.1
+++ cgi2.t 3 Jul 2004 18:45:46 -0000 1.2
@@ -44,8 +44,8 @@
sok {
my $header = 'Content-type';
$res = GET $location;
- t_cmp(qr{^text/test-output},
- $res->header($header),
+ t_cmp($res->header($header),
+ qr{^text/test-output},
"$header header");
};
1.4 +1 -1 modperl-2.0/t/modules/include.t
Index: include.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modules/include.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- include.t 21 Nov 2003 23:15:46 -0000 1.3
+++ include.t 3 Jul 2004 18:45:46 -0000 1.4
@@ -29,5 +29,5 @@
ok $str;
for my $pat (@patterns) {
- ok t_cmp(qr{$pat}, $str, "/$pat/");
+ ok t_cmp($str, qr{$pat}, "/$pat/");
}
1.2 +1 -1 modperl-2.0/t/modules/include2.t
Index: include2.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modules/include2.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- include2.t 7 Oct 2002 20:44:31 -0000 1.1
+++ include2.t 3 Jul 2004 18:45:46 -0000 1.2
@@ -27,5 +27,5 @@
ok $str;
for my $pat (@patterns) {
- ok t_cmp(qr{$pat}, $str, "/$pat/");
+ ok t_cmp($str, qr{$pat}, "/$pat/");
}
1.13 +4 -6 modperl-2.0/t/response/TestAPI/rutil.pm
Index: rutil.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/rutil.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- rutil.pm 25 May 2004 08:25:44 -0000 1.12
+++ rutil.pm 3 Jul 2004 18:45:46 -0000 1.13
@@ -29,12 +29,10 @@
my $pattern = qr!(?s)GET /TestAPI__rutil.*Host:.*200 OK.*Content-Type:!;
- ok t_cmp(
- $pattern,
- $r->as_string,
- "test for the request_line, host, status, and few " .
- " headers that should always be there"
- );
+ ok t_cmp($r->as_string,
+ $pattern,
+ "test for the request_line, host, status, and few " .
+ " headers that should always be there");
Apache::OK;
}
1.16 +2 -2 modperl-2.0/t/response/TestAPI/server_util.pm
Index: server_util.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_util.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- server_util.pm 2 Jun 2004 02:13:24 -0000 1.15
+++ server_util.pm 3 Jul 2004 18:45:46 -0000 1.16
@@ -90,8 +90,8 @@
my $obj = bless {}, 'Apache::Foo';
eval { Apache::server_root_relative($obj, 'conf') };
- ok t_cmp(qr/server_root_relative.*no .* key/,
- $@,
+ ok t_cmp($@,
+ qr/server_root_relative.*no .* key/,
"Apache::server_root_relative(\$obj, 'conf')");
}
1.3 +2 -2 modperl-2.0/t/response/TestAPI/show.pm
Index: show.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/show.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- show.pm 18 Dec 2003 19:04:23 -0000 1.2
+++ show.pm 3 Jul 2004 18:45:46 -0000 1.3
@@ -16,8 +16,8 @@
my $mpm = Apache::Test::config->{server}->{mpm};
- ok t_cmp(qr!$mpm!i,
- Apache::MPM->show(),
+ ok t_cmp(Apache::MPM->show(),
+ qr!$mpm!i,
'Apache::MPM->show()');
Apache::OK;
1.3 +2 -2 modperl-2.0/t/response/TestAPI/slurp_filename.pm
Index: slurp_filename.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/slurp_filename.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- slurp_filename.pm 26 Sep 2003 21:18:17 -0000 1.2
+++ slurp_filename.pm 3 Jul 2004 18:45:46 -0000 1.3
@@ -34,7 +34,7 @@
my $data = $r->slurp_filename; # tainted
my $received;
eval { $received = eval $$data };
- ok t_cmp(qr/Insecure dependency in eval/, $@,
+ ok t_cmp($@, qr/Insecure dependency in eval/,
"slurp filename tainted");
ModPerl::Util::untaint($$data);
@@ -48,7 +48,7 @@
my $data = slurp_filename_perl($r); # tainted
my $received;
eval { $received = eval $$data };
- ok t_cmp(qr/Insecure dependency in eval/, $@,
+ ok t_cmp($@, qr/Insecure dependency in eval/,
"slurp filename (perl) tainted");
ModPerl::Util::untaint($$data);
1.16 +5 -5 modperl-2.0/t/response/TestAPI/uri.pm
Index: uri.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/uri.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- uri.pm 29 May 2004 09:48:43 -0000 1.15
+++ uri.pm 3 Jul 2004 18:45:46 -0000 1.16
@@ -30,10 +30,10 @@
ok $uri->isa('APR::URI');
- ok t_cmp(qr/^$location/, $uri->path, "path");
+ ok t_cmp($uri->path, qr/^$location/, "path");
my $up = $uri->unparse;
- ok t_cmp(qr/^$location/, $up, "unparse");
+ ok t_cmp($up, qr/^$location/, "unparse");
}
# construct_server
@@ -81,7 +81,7 @@
ok $parsed->isa('APR::URI');
my $up = $parsed->unparse;
- ok t_cmp(qr/$location/, $up, "unparse");
+ ok t_cmp($up, qr/$location/, "unparse");
my $path = '/foo/bar';
@@ -99,7 +99,7 @@
my $parsed = APR::URI->parse($r->pool, $curl);
my $up = $parsed->unparse;
- ok t_cmp(qr/$location/, $up, 'construct_url($uri)');
+ ok t_cmp($up, qr/$location/, 'construct_url($uri)');
ok t_cmp($r->args, $parsed->query, "args vs query");
}
{
@@ -109,7 +109,7 @@
t_debug("construct_url: $curl");
t_debug("r->uri: ", $r->uri);
my $up = APR::URI->parse($r->pool, $curl)->unparse;
- ok t_cmp(qr/$location/, $up, 'construct_url($uri, $pool)');
+ ok t_cmp($up, qr/$location/, 'construct_url($uri, $pool)');
}
# segfault test
1.5 +2 -2 modperl-2.0/t/response/TestAPR/bucket.pm
Index: bucket.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/bucket.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- bucket.pm 9 Jun 2004 14:46:22 -0000 1.4
+++ bucket.pm 3 Jul 2004 18:45:46 -0000 1.5
@@ -73,8 +73,8 @@
my $len = 10;
my $real = substr $data, $offset, $len;
my $b = eval { APR::Bucket->new($data, $offset, $len) };
- ok t_cmp(qr/the length argument can't be bigger than the total/,
- $@,
+ ok t_cmp($@,
+ qr/the length argument can't be bigger than the total/,
'new($data, $offset, $len_too_big)');
}
1.5 +2 -2 modperl-2.0/t/response/TestAPR/flatten.pm
Index: flatten.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/flatten.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- flatten.pm 9 Jun 2004 14:46:22 -0000 1.4
+++ flatten.pm 3 Jul 2004 18:45:46 -0000 1.5
@@ -39,8 +39,8 @@
# syntax: require a $bb
eval { APR::Brigade::flatten("") };
- ok t_cmp(qr!usage: \$bb->flatten\(\$buf, \[\$wanted\]\)!,
- $@,
+ ok t_cmp($@,
+ qr!usage: \$bb->flatten\(\$buf, \[\$wanted\]\)!,
'APR::Brigade::flatten() requires a brigade');
# flatten() will slurp up the entire brigade
1.3 +2 -2 modperl-2.0/t/response/TestAPR/ipsubnet.pm
Index: ipsubnet.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/ipsubnet.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- ipsubnet.pm 21 May 2004 23:12:55 -0000 1.2
+++ ipsubnet.pm 3 Jul 2004 18:45:46 -0000 1.3
@@ -60,13 +60,13 @@
# bogus IP
{
my $ipsub = eval { APR::IpSubnet->new($p, "345.234.678.987") };
- ok t_cmp(qr/The specified IP address is invalid/, $@, "bogus IP");
+ ok t_cmp($@, qr/The specified IP address is invalid/, "bogus IP");
}
# bogus mask
{
my $ipsub = eval { APR::IpSubnet->new($p, $ip, "255.0") };
- ok t_cmp(qr/The specified network mask is invalid/, $@, "bogus mask");
+ ok t_cmp($@, qr/The specified network mask is invalid/, "bogus mask");
}
Apache::OK;
1.16 +10 -10 modperl-2.0/t/response/TestAPR/pool.pm
Index: pool.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/pool.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- pool.pm 26 May 2004 02:34:45 -0000 1.15
+++ pool.pm 3 Jul 2004 18:45:46 -0000 1.16
@@ -178,8 +178,8 @@
# this should "gracefully" fail, since $sp's guts were
# destroyed when the parent pool was destroyed
eval { $pp = $sp->parent_get };
- ok t_cmp(qr/invalid pool object/,
- $@,
+ ok t_cmp($@,
+ qr/invalid pool object/,
"parent pool destroys child pool");
# since pool $sp now contains 0 pointer, if we try to make a
@@ -219,8 +219,8 @@
# must make sure that it won't try to hijack the new pool
# $pp2 that (hopefully) took over $pp's place
eval { $pp->parent_get };
- ok t_cmp(qr/invalid pool object/,
- $@,
+ ok t_cmp($@,
+ qr/invalid pool object/,
"a dead pool is a dead pool");
}
@@ -377,16 +377,16 @@
my $p = APR::Pool->new;
$p->cleanup_register('TestAPR::pool::some_non_existing_sub', 1);
eval { $p->destroy };
- ok t_cmp(qr/Undefined subroutine/,
- $@,
+ ok t_cmp($@,
+ qr/Undefined subroutine/,
"non existing function");
}
{
my $p = APR::Pool->new;
$p->cleanup_register(\&non_existing1, 1);
eval { $p->destroy };
- ok t_cmp(qr/Undefined subroutine/,
- $@,
+ ok t_cmp($@,
+ qr/Undefined subroutine/,
"non existing function");
}
@@ -403,8 +403,8 @@
# # sub-pool $sp should be now bogus, as clear() destroys
# # subpools
# eval { $sp->parent_get };
-# ok t_cmp(qr/invalid pool object/,
-# $@,
+# ok t_cmp($@,
+# qr/invalid pool object/,
# "clear destroys sub pools");
#
# # now we should be able to use the parent pool without
1.4 +1 -1 modperl-2.0/t/response/TestApache/util.pm
Index: util.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestApache/util.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- util.pm 20 Apr 2004 00:25:54 -0000 1.3
+++ util.pm 3 Jul 2004 18:45:46 -0000 1.4
@@ -65,7 +65,7 @@
ok t_cmp($time, $ptime, $comment);
}
else {
- ok t_cmp($fmtdate_ptn, $fmtdate, $comment);
+ ok t_cmp($fmtdate, $fmtdate_ptn, $comment);
}
}
1.9 +10 -9 modperl-2.0/t/response/TestDirective/perldo.pm
Index: perldo.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perldo.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- perldo.pm 26 Mar 2004 22:17:07 -0000 1.8
+++ perldo.pm 3 Jul 2004 18:45:46 -0000 1.9
@@ -14,10 +14,11 @@
plan $r, tests => 15;
ok t_cmp('yes', $TestDirective::perl::worked);
-
- ok t_cmp(qr/t::conf::extra_last_conf::line_\d+$/,
- $TestDirective::perl::PACKAGE, '__PACKAGE__');
-
+
+ ok t_cmp($TestDirective::perl::PACKAGE,
+ qr/t::conf::extra_last_conf::line_\d+$/,
+ '__PACKAGE__');
+
my %Location;
{
no strict 'refs';
@@ -32,8 +33,8 @@
ok t_cmp('yes', $TestDirective::perl::comments);
- ok t_cmp(qr/extra.last.conf/, $TestDirective::perl::dollar_zero, '$0');
- ok t_cmp(qr/extra.last.conf/, $TestDirective::perl::filename, '__FILE__');
+ ok t_cmp($TestDirective::perl::dollar_zero, qr/extra.last.conf/, '$0');
+ ok t_cmp($TestDirective::perl::filename, qr/extra.last.conf/, '__FILE__');
# 3 would mean we are still counting lines from the context of the eval
ok $TestDirective::perl::line > 3;
@@ -43,12 +44,12 @@
ok t_cmp(1, $TestDirective::perl::Included, "Include");
my $dump = Apache::PerlSections->dump;
- ok t_cmp(qr/__END__/, $dump, "Apache::PerlSections->dump");
-
+ ok t_cmp($dump, qr/__END__/, "Apache::PerlSections->dump");
+
eval "package TestDirective::perldo::test;\nno strict;\n$dump";
ok t_cmp("", $@, "PerlSections dump syntax check");
- ok t_cmp(qr/perlsection.conf/, $TestDirective::perldo::test::Include);
+ ok t_cmp($TestDirective::perldo::test::Include, qr/perlsection.conf/);
Apache::OK;
}
1.4 +1 -1 modperl-2.0/t/response/TestDirective/perlloadmodule.pm
Index: perlloadmodule.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestDirective/perlloadmodule.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- perlloadmodule.pm 30 May 2003 12:55:14 -0000 1.3
+++ perlloadmodule.pm 3 Jul 2004 18:45:46 -0000 1.4
@@ -110,7 +110,7 @@
my $path = $dir_cfg->{path};
- ok t_cmp(qr{^$path}, $r->uri,
+ ok t_cmp($r->uri, qr{^$path},
'r->uri =~ parms->path');
ok t_cmp($self, $srv_cfg->{name},
1.2 +3 -2 modperl-2.0/t/response/TestError/api.pm
Index: api.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestError/api.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- api.pm 31 Jan 2003 03:15:23 -0000 1.1
+++ api.pm 3 Jul 2004 18:45:46 -0000 1.2
@@ -20,8 +20,9 @@
# PerlOptions -GlobalRequest is in effect
eval { Apache->request; };
- ok t_cmp(qr/\$r object is not available/,
- $@, "unavailable global $r object");
+ ok t_cmp($@,
+ qr/\$r object is not available/,
+ "unavailable global $r object");
return Apache::OK;
}
1.3 +2 -2 modperl-2.0/t/response/TestModperl/taint.pm
Index: taint.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/taint.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- taint.pm 7 Apr 2003 05:01:48 -0000 1.2
+++ taint.pm 3 Jul 2004 18:45:46 -0000 1.3
@@ -24,13 +24,13 @@
ok t_cmp(1, ${^TAINT}, "\${^TAINT}");
eval { ${^TAINT} = 0 };
- ok t_cmp(qr/read-only/, $@, "\${^TAINT} is read-only");
+ ok t_cmp($@, qr/read-only/, "\${^TAINT} is read-only");
if ($build->{MP_COMPAT_1X}) {
ok t_cmp(1, $Apache::__T, "\$Apache::__T");
eval { $Apache::__T = 0 };
- ok t_cmp(qr/read-only/, $@, "\$Apache::__T is read-only");
+ ok t_cmp($@, qr/read-only/, "\$Apache::__T is read-only");
}
Apache::OK;