perl-test-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r156463 - in perl/Apache-Test/branches/apache2-rename-unstable: ./ Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/ lib/Apache/
Date Mon, 07 Mar 2005 23:13:20 GMT
Author: joes
Date: Mon Mar  7 15:13:16 2005
New Revision: 156463

URL: http://svn.apache.org/viewcvs?view=rev&rev=156463
Log:

s/Apache::/Apache2::/g in all mp2 modules used.
Also remove Apache::TestConfig::modperl_2_inc_fixup()
since MP_INST_APACHE2 is going away.

Modified:
    perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Hello.pm
    perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Vhost.pm
    perl/Apache-Test/branches/apache2-rename-unstable/Changes
    perl/Apache-Test/branches/apache2-rename-unstable/README
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/Test.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfig.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfigPerl.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestHandler.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMB.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMM.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestReport.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRun.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRunPerl.pm
    perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestSmoke.pm

Modified: perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Hello.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Hello.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Hello.pm
(original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Hello.pm
Mon Mar  7 15:13:16 2005
@@ -1,8 +1,8 @@
 package TestBasic::Hello;
 
-use Apache::RequestRec ();
-use Apache::RequestIO ();
-use Apache::Const -compile => qw(OK);
+use Apache2::RequestRec ();
+use Apache2::RequestIO ();
+use Apache2::Const -compile => qw(OK);
 
 # XXX: adjust the test that it'll work under mp1 as well
 
@@ -13,7 +13,7 @@
   $r->content_type('text/plain');
   $r->print('Hello');
 
-  return Apache::OK;
+  return Apache2::OK;
 }
 
 1;

Modified: perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Vhost.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Vhost.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Vhost.pm
(original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/Apache-TestItSelf/Apache-TestMe/t/response/TestBasic/Vhost.pm
Mon Mar  7 15:13:16 2005
@@ -1,6 +1,6 @@
 package TestBasic::Vhost;
 
-use Apache::Const -compile => qw(OK);
+use Apache2::Const -compile => qw(OK);
 use Apache::Test;
 
 # XXX: adjust the test that it'll work under mp1 as well
@@ -13,7 +13,7 @@
 
   ok 1;
 
-  return Apache::OK;
+  return Apache2::OK;
 }
 
 1;

Modified: perl/Apache-Test/branches/apache2-rename-unstable/Changes
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/Changes?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/Changes (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/Changes Mon Mar  7 15:13:16 2005
@@ -8,6 +8,9 @@
 
 =item 1.21-dev
 
+Add support for mp2's Apache:: -> Apache2:: rename;
+remove Apache::TestConfig::modperl_2_inc_fixup() [joes].
+
 fix Apache::TestConfig (was missing 'use lib' before using
 lib::import) [William McKee <william@knowmad.com>]
 

Modified: perl/Apache-Test/branches/apache2-rename-unstable/README
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/README?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/README (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/README Mon Mar  7 15:13:16 2005
@@ -111,7 +111,7 @@
 % t/TEST -httpd ~/ap/httpd-2.0/httpd
 
 configure a DSO mod_perl object other than the default (that stored in
-Apache::BuildConfig)
+Apache2::BuildConfig)
 % t/TEST -libmodperl ~/ap/httpd-2.0/modules/mod_perl-5.8.0.so
 or one that can be found relative to LIBEXECDIR
 % t/TEST -libmodperl mod_perl-5.6.1.so

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/Test.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/Test.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/Test.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/Test.pm Mon Mar  7 15:13:16
2005
@@ -155,12 +155,12 @@
 sub init_test_pm {
     my $r = shift;
 
-    # needed to load Apache::RequestRec::TIEHANDLE
-    eval {require Apache::RequestIO};
-    if (defined &Apache::RequestRec::TIEHANDLE) {
+    # needed to load Apache2::RequestRec::TIEHANDLE
+    eval {require Apache2::RequestIO};
+    if (defined &Apache2::RequestRec::TIEHANDLE) {
         untie *STDOUT;
         tie *STDOUT, $r;
-        require Apache::RequestRec; # $r->pool
+        require Apache2::RequestRec; # $r->pool
         require APR::Pool;
         $r->pool->cleanup_register(sub { untie *STDOUT });
     }

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfig.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfig.pm Mon Mar  7
15:13:16 2005
@@ -28,10 +28,10 @@
 use constant DEFAULT_PORT => 8529;
 
 use constant IS_MOD_PERL_2       =>
-    eval { require mod_perl && $mod_perl::VERSION >= 1.99 } || 0;
+    eval { require mod_perl2 } || 0;
 
 use constant IS_MOD_PERL_2_BUILD => IS_MOD_PERL_2 &&
-    require Apache::Build && Apache::Build::IS_MOD_PERL_BUILD();
+    require Apache2::Build && Apache2::Build::IS_MOD_PERL_BUILD();
 
 use constant IS_APACHE_TEST_BUILD =>
     grep { -e "$_/lib/Apache/TestConfig.pm" } qw(Apache-Test . ..);
@@ -86,7 +86,7 @@
    sbindir         => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
    httpd           => 'server to use for testing (default is $bindir/httpd)',
    target          => 'name of server binary (default is apxs -q TARGET)',
-   apxs            => 'location of apxs (default is from Apache::BuildConfig)',
+   apxs            => 'location of apxs (default is from Apache2::BuildConfig)',
    startup_timeout => 'seconds to wait for the server to start (default is 60)',
    httpd_conf      => 'inherit config from this file (default is apxs derived)',
    httpd_conf_extra=> 'inherit additional config from this file',
@@ -172,10 +172,6 @@
 
 sub server { shift->{server} }
 
-sub modperl_2_inc_fixup {
-    (IS_MOD_PERL_2 && !IS_MOD_PERL_2_BUILD) ? "use Apache2;\n" : '';
-}
-
 sub modperl_build_config {
 
     # we don't want to get mp2 preconfigured data in order to be able
@@ -183,9 +179,9 @@
     return undef if $ENV{APACHE_TEST_INTERACTIVE_CONFIG_TEST};
 
     eval {
-        require Apache::Build;
+        require Apache2::Build;
     } or return undef;
-    return Apache::Build->build_config;
+    return Apache2::Build->build_config;
 }
 
 sub new_test_server {

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfigPerl.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfigPerl.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfigPerl.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestConfigPerl.pm Mon Mar
 7 15:13:16 2005
@@ -184,8 +184,6 @@
         if (-d $tlib) {
             print $fh "use lib '$tlib';\n";
         }
-        my $fixup = Apache::TestConfig->modperl_2_inc_fixup();
-        print $fh $fixup;
 
         # if Apache::Test is used to develop a project, we want the
         # project/lib directory to be first in @INC (loaded last)

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestHandler.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestHandler.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestHandler.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestHandler.pm Mon Mar  7
15:13:16 2005
@@ -25,13 +25,13 @@
 #some utility handlers for testing hooks other than response
 #see modperl-2.0/t/hooks/TestHooks/authen.pm
 
-if ($ENV{MOD_PERL} && require mod_perl && $mod_perl::VERSION > 1.99) {
-    require Apache::RequestIO; # puts
+if ($ENV{MOD_PERL} && require mod_perl2) {
+    require Apache2::RequestIO; # puts
 }
 
 #compat with 1.xx
 my $send_http_header = Apache->can('send_http_header') || sub {};
-my $print = Apache->can('print') || Apache::RequestRec->can('puts');
+my $print = Apache->can('print') || Apache2::RequestRec->can('puts');
 
 sub ok {
     my $r = shift;

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMB.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMB.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMB.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMB.pm Mon Mar  7 15:13:16
2005
@@ -138,8 +138,7 @@
     unlink $script if -e $script;
 
     # Start the contents of t/TEST.
-    my $body = "BEGIN { eval { require blib && blib->import; } }\n"
-      . Apache::TestConfig->modperl_2_inc_fixup;
+    my $body = "BEGIN { eval { require blib && blib->import; } }\n";
 
     # Configure the arguments for t/TEST.
     while (my($k, $v) = each %{ $self->apache_test_args }) {

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMM.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMM.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMM.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestMM.pm Mon Mar  7 15:13:16
2005
@@ -116,8 +116,6 @@
 
     my $body = "BEGIN { eval { require blib && blib->import; } }\n";
 
-    $body .= Apache::TestConfig->modperl_2_inc_fixup;
-
     my %args = @Apache::TestMM::Argv;
     while (my($k, $v) = each %args) {
         $v =~ s/\|/\\|/g;

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestReport.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestReport.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestReport.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestReport.pm Mon Mar  7
15:13:16 2005
@@ -37,7 +37,6 @@
 
     my $content = join "\n",
         "BEGIN { eval { require blib && blib->import; } }",
-        Apache::TestConfig->modperl_2_inc_fixup,
         Apache::TestConfig->perlscript_header,
         "use $class;",
         "$class->new(\@ARGV)->run;";

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRun.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRun.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRun.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRun.pm Mon Mar  7 15:13:16
2005
@@ -1263,8 +1263,6 @@
 
     my $body = "BEGIN { eval { require blib && blib->import; } }\n";
 
-    $body .= Apache::TestConfig->modperl_2_inc_fixup;
-
     my %args = @Apache::TestMM::Argv;
     while (my($k, $v) = each %args) {
         $v =~ s/\|/\\|/g;

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRunPerl.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRunPerl.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRunPerl.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestRunPerl.pm Mon Mar  7
15:13:16 2005
@@ -50,7 +50,7 @@
 
     # sanity checking and loading the right mod_perl version
     if ($rev == 2) {
-        eval { require Apache2 && require mod_perl };
+        eval { require mod_perl2 };
     } else {
         eval { require mod_perl };
     }

Modified: perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestSmoke.pm
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestSmoke.pm?view=diff&r1=156462&r2=156463
==============================================================================
--- perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestSmoke.pm (original)
+++ perl/Apache-Test/branches/apache2-rename-unstable/lib/Apache/TestSmoke.pm Mon Mar  7 15:13:16
2005
@@ -771,7 +771,6 @@
 
     my $content = join "\n",
         "BEGIN { eval { require blib && blib->import; } }",
-        Apache::TestConfig->modperl_2_inc_fixup,
         Apache::TestConfig->perlscript_header,
         "use $class;",
         "$class->new(\@ARGV)->run;";



Mime
View raw message