Author: geoff
Date: Mon Apr 4 07:12:38 2005
New Revision: 160045
URL: http://svn.apache.org/viewcvs?view=rev&rev=160045
Log:
move t/apache2 back to t/apache - we're testing thing specific
to Apache the server, not Apache2 the namespace
Added:
perl/modperl/trunk/t/apache/ (props changed)
- copied from r160041, perl/modperl/trunk/t/apache2/
perl/modperl/trunk/t/response/TestApache/
- copied from r160041, perl/modperl/trunk/t/response/TestApache2/
Removed:
perl/modperl/trunk/t/apache2/
perl/modperl/trunk/t/response/TestApache2/
Modified:
perl/modperl/trunk/t/apache/add_config.t
perl/modperl/trunk/t/apache/cgihandler.t
perl/modperl/trunk/t/apache/content_length_header.t
perl/modperl/trunk/t/apache/discard_rbody.t
perl/modperl/trunk/t/apache/post.t
perl/modperl/trunk/t/apache/read.t
perl/modperl/trunk/t/apache/read2.t
perl/modperl/trunk/t/apache/scanhdrs.t
perl/modperl/trunk/t/apache/scanhdrs2.t
perl/modperl/trunk/t/apache/send_cgi_header.t
perl/modperl/trunk/t/conf/modperl_extra.pl
perl/modperl/trunk/t/response/TestApache/cgihandler.pm
perl/modperl/trunk/t/response/TestApache/conftree.pm
perl/modperl/trunk/t/response/TestApache/content_length_header.pm
perl/modperl/trunk/t/response/TestApache/discard_rbody.pm
perl/modperl/trunk/t/response/TestApache/post.pm
perl/modperl/trunk/t/response/TestApache/read.pm
perl/modperl/trunk/t/response/TestApache/read2.pm
perl/modperl/trunk/t/response/TestApache/scanhdrs.pm
perl/modperl/trunk/t/response/TestApache/scanhdrs2.pm
perl/modperl/trunk/t/response/TestApache/send_cgi_header.pm
perl/modperl/trunk/t/response/TestApache/subprocess.pm
perl/modperl/trunk/t/response/TestApache/util.pm
perl/modperl/trunk/t/response/TestApache/write.pm
Propchange: perl/modperl/trunk/t/apache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 4 07:12:38 2005
@@ -0,0 +1,9 @@
+cgihandler.t
+conftree.t
+constants.t
+post.t
+read.t
+scanhdrs.t
+write.t
+subprocess.t
+util.t
Modified: perl/modperl/trunk/t/apache/add_config.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/add_config.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/add_config.t (original)
+++ perl/modperl/trunk/t/apache/add_config.t Mon Apr 4 07:12:38 2005
@@ -2,4 +2,4 @@
# Apache2->server->add_config
use Apache::TestRequest 'GET_BODY_ASSERT';
-print GET_BODY_ASSERT "/apache2/add_config";
+print GET_BODY_ASSERT "/apache/add_config";
Modified: perl/modperl/trunk/t/apache/cgihandler.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/cgihandler.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/cgihandler.t (original)
+++ perl/modperl/trunk/t/apache/cgihandler.t Mon Apr 4 07:12:38 2005
@@ -7,7 +7,7 @@
plan tests => 2;
-my $location = "/TestApache2__cgihandler";
+my $location = "/TestApache__cgihandler";
my $expected = "1..3\nok 1\nok 2\nok 3\n";
Modified: perl/modperl/trunk/t/apache/content_length_header.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/content_length_header.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/content_length_header.t (original)
+++ perl/modperl/trunk/t/apache/content_length_header.t Mon Apr 4 07:12:38 2005
@@ -7,7 +7,7 @@
plan tests => 12 * 2 + 3;
-my $location = "/TestApache2__content_length_header";
+my $location = "/TestApache__content_length_header";
# 1. because Apache proclaims itself governor of the C-L header via
# the C-L filter (ap_content_length_filter at
Modified: perl/modperl/trunk/t/apache/discard_rbody.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/discard_rbody.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/discard_rbody.t (original)
+++ perl/modperl/trunk/t/apache/discard_rbody.t Mon Apr 4 07:12:38 2005
@@ -5,7 +5,7 @@
use Apache::Test;
use Apache::TestRequest;
-my $location = "/TestApache2__discard_rbody";
+my $location = "/TestApache__discard_rbody";
my $content = "Y" x 100000; # more than one bucket
plan tests => 3;
Modified: perl/modperl/trunk/t/apache/post.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/post.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/post.t (original)
+++ perl/modperl/trunk/t/apache/post.t Mon Apr 4 07:12:38 2005
@@ -7,7 +7,7 @@
plan tests => 2;
-my $location = "/TestApache2__post";
+my $location = "/TestApache__post";
my $str;
my @data = (arizona => 'wildcats');
Modified: perl/modperl/trunk/t/apache/read.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/read.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/read.t (original)
+++ perl/modperl/trunk/t/apache/read.t Mon Apr 4 07:12:38 2005
@@ -11,7 +11,7 @@
#force test to go over http, since this doesn't work with t/TEST -ssl
Apache::TestRequest::scheme('http');
-my $location = "/TestApache2__read";
+my $location = "/TestApache__read";
my $socket = Apache::TestRequest::vhost_socket('default');
Modified: perl/modperl/trunk/t/apache/read2.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/read2.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/read2.t (original)
+++ perl/modperl/trunk/t/apache/read2.t Mon Apr 4 07:12:38 2005
@@ -1,3 +1,3 @@
use Apache::TestRequest 'POST_BODY_ASSERT';
-print POST_BODY_ASSERT "/TestApache2__read2",
+print POST_BODY_ASSERT "/TestApache__read2",
content => "foobar";
Modified: perl/modperl/trunk/t/apache/scanhdrs.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/scanhdrs.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/scanhdrs.t (original)
+++ perl/modperl/trunk/t/apache/scanhdrs.t Mon Apr 4 07:12:38 2005
@@ -7,7 +7,7 @@
plan tests => 4;
-my $module = 'TestApache2::scanhdrs';
+my $module = 'TestApache::scanhdrs';
my $location = "/" . Apache::TestRequest::module2path($module);
my $res = GET $location;
Modified: perl/modperl/trunk/t/apache/scanhdrs2.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/scanhdrs2.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/scanhdrs2.t (original)
+++ perl/modperl/trunk/t/apache/scanhdrs2.t Mon Apr 4 07:12:38 2005
@@ -7,7 +7,7 @@
plan tests => 5, need 'HTML::HeadParser';
-my $module = 'TestApache2__scanhdrs2';
+my $module = 'TestApache__scanhdrs2';
my $location = "/$module";
my $redirect = 'http://perl.apache.org/';
Modified: perl/modperl/trunk/t/apache/send_cgi_header.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apache/send_cgi_header.t?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/apache/send_cgi_header.t (original)
+++ perl/modperl/trunk/t/apache/send_cgi_header.t Mon Apr 4 07:12:38 2005
@@ -7,7 +7,7 @@
plan tests => 4;
-my $location = "/TestApache2__send_cgi_header";
+my $location = "/TestApache__send_cgi_header";
my $res = GET $location;
ok t_cmp($res->header('X-Foo'),
Modified: perl/modperl/trunk/t/conf/modperl_extra.pl
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/conf/modperl_extra.pl?view=diff&r1=160044&r2=160045
==============================================================================
--- perl/modperl/trunk/t/conf/modperl_extra.pl (original)
+++ perl/modperl/trunk/t/conf/modperl_extra.pl Mon Apr 4 07:12:38 2005
@@ -94,7 +94,7 @@
my $conf = <<'EOC';
# must use PerlModule here to check for segfaults
PerlModule Apache::TestHandler
-<Location /apache2/add_config>
+<Location /apache/add_config>
SetHandler perl-script
PerlResponseHandler Apache::TestHandler::ok1
</Location>
Modified: perl/modperl/trunk/t/response/TestApache/cgihandler.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/cgihandler.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/cgihandler.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/cgihandler.pm Mon Apr 4 07:12:38
2005
@@ -1,4 +1,4 @@
-package TestApache2::cgihandler;
+package TestApache::cgihandler;
use strict;
use warnings FATAL => 'all';
@@ -41,5 +41,5 @@
1;
__END__
SetHandler perl-script
-PerlResponseHandler TestApache2::cgihandler
+PerlResponseHandler TestApache::cgihandler
Modified: perl/modperl/trunk/t/response/TestApache/conftree.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/conftree.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/conftree.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/conftree.pm Mon Apr 4 07:12:38
2005
@@ -1,4 +1,4 @@
-package TestApache2::conftree;
+package TestApache::conftree;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/content_length_header.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/content_length_header.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/content_length_header.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/content_length_header.pm Mon Apr
4 07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::content_length_header;
+package TestApache::content_length_header;
# see the client t/apache/content_length_header.t for the comments
Modified: perl/modperl/trunk/t/response/TestApache/discard_rbody.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/discard_rbody.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/discard_rbody.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/discard_rbody.pm Mon Apr 4
07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::discard_rbody;
+package TestApache::discard_rbody;
# test $r->discard_request_body when the input body wasn't read at
# all, read partially or completely.
Modified: perl/modperl/trunk/t/response/TestApache/post.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/post.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/post.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/post.pm Mon Apr 4 07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::post;
+package TestApache::post;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/read.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/read.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/read.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/read.pm Mon Apr 4 07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::read;
+package TestApache::read;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/read2.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/read2.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/read2.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/read2.pm Mon Apr 4 07:12:38 2005
@@ -1,6 +1,6 @@
-package TestApache2::read2;
+package TestApache::read2;
-# extra tests in addition to TestApache2::read
+# extra tests in addition to TestApache::read
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/scanhdrs.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/scanhdrs.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/scanhdrs.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/scanhdrs.pm Mon Apr 4 07:12:38
2005
@@ -1,4 +1,4 @@
-package TestApache2::scanhdrs;
+package TestApache::scanhdrs;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/scanhdrs2.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/scanhdrs2.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/scanhdrs2.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/scanhdrs2.pm Mon Apr 4 07:12:38
2005
@@ -1,4 +1,4 @@
-package TestApache2::scanhdrs2;
+package TestApache::scanhdrs2;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/send_cgi_header.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/send_cgi_header.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/send_cgi_header.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/send_cgi_header.pm Mon Apr 4
07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::send_cgi_header;
+package TestApache::send_cgi_header;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/subprocess.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/subprocess.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/subprocess.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/subprocess.pm Mon Apr 4 07:12:38
2005
@@ -1,4 +1,4 @@
-package TestApache2::subprocess;
+package TestApache::subprocess;
use strict;
use warnings FATAL => 'all';
Modified: perl/modperl/trunk/t/response/TestApache/util.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/util.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/util.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/util.pm Mon Apr 4 07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::util;
+package TestApache::util;
# Apache2::Util tests
Modified: perl/modperl/trunk/t/response/TestApache/write.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/write.pm?view=diff&r1=160041&r2=160045
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/write.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/write.pm Mon Apr 4 07:12:38 2005
@@ -1,4 +1,4 @@
-package TestApache2::write;
+package TestApache::write;
use strict;
use warnings FATAL => 'all';
