You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by pg...@apache.org on 2005/11/29 20:25:31 UTC

svn commit: r349797 - /perl/Apache-Test/trunk/Apache-TestItSelf/sample/testitself_conf_apache_test_core.pl

Author: pgollucci
Date: Tue Nov 29 11:25:29 2005
New Revision: 349797

URL: http://svn.apache.org/viewcvs?rev=349797&view=rev
Log:
o Clean up this file
	- add use strict
	- move paths and versions to variables at top


Modified:
    perl/Apache-Test/trunk/Apache-TestItSelf/sample/testitself_conf_apache_test_core.pl

Modified: perl/Apache-Test/trunk/Apache-TestItSelf/sample/testitself_conf_apache_test_core.pl
URL: http://svn.apache.org/viewcvs/perl/Apache-Test/trunk/Apache-TestItSelf/sample/testitself_conf_apache_test_core.pl?rev=349797&r1=349796&r2=349797&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Apache-TestItSelf/sample/testitself_conf_apache_test_core.pl (original)
+++ perl/Apache-Test/trunk/Apache-TestItSelf/sample/testitself_conf_apache_test_core.pl Tue Nov 29 11:25:29 2005
@@ -1,27 +1,44 @@
 # This is a config file for testing Apache-Test
 
+use strict;
+use warnings FATAL => 'all';
+
+my $base = "/home/$ENV{USER}";
+
+my $perl_base    = "$base/perl";
+my $perl_ver     = "5.8.7-ithread";
+my $PERL         = "$perl_base/$perl_ver/bin/perl$perl_ver";
+
+my $httpd_base   = "$base/httpd";
+my $httpd_gen    = '2.0';
+my $httpd_ver    = 'Apache/2.0.55';
+my @mpms         = (qw(prefork worker));
+
+my $mp_gen       = 2.0;
+my $mod_perl_so  = "mod_perl-$perl_ver.so";
+
 %Apache::TestItSelf::Config = (
     repos_type    => 'apache_test_core',
-    perl_exec     => "/home/$ENV{USER}/perl/5.8.7-ithread/bin/perl5.8.7",
-    mp_gen        => '2.0',
-    httpd_gen     => '2.0',
-    httpd_version => 'Apache/2.0.55',
+    perl_exec     => $PERL,
+    mp_gen        => $mp_gen,
+    httpd_gen     => $httpd_gen,
+    httpd_version => $httpd_ver,
     timeout       => 200,
     test_verbose  => 0,
 );
 
-my $path = "/home/$ENV{USER}/httpd";
-
 @Apache::TestItSelf::Configs = ();
-for (qw(prefork worker)) {
+foreach my $mpm (@mpms) {
     push @Apache::TestItSelf::Configs,
         {
-         apxs_exec     => "$path/$_/bin/apxs",
-         httpd_exec    => "$path/$_/bin/httpd",
-         httpd_conf    => "$path/$_/conf/httpd.conf",
-         httpd_mpm     => "$_",
-         makepl_arg    => "MOD_PERL=2 -libmodperl $path/$_/modules/mod_perl-5.8.7-ithread.so",
+         apxs_exec     => "$httpd_base/$mpm/bin/apxs",
+         httpd_exec    => "$httpd_base/$mpm/bin/httpd",
+         httpd_conf    => "$httpd_base/$mpm/conf/httpd.conf",
+         httpd_mpm     => $mpm,
+         makepl_arg    => "MOD_PERL=2 -libmodperl $httpd_base/$mpm/modules/$mod_perl_so",
         };
 }
 
 1;
+
+