[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.5-232-g4f451bb

[Emmanuel Lacour]

The branch, 3.8-trunk has been updated
       via  4f451bb02c9c509d72fd0f5f4de089ce7f108791 (commit)
       via  b04f298110527ff2005b8b6bd662248e9877a8a7 (commit)
      from  aaa388eed87cf5feddc7fbe8052f496449d906fe (commit)

Summary of changes:
 lib/RT/Test.pm |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit b04f298110527ff2005b8b6bd662248e9877a8a7
Author: Emmanuel Lacour <elacour at home-dn.net>
Date:   Mon Oct 5 14:07:59 2009 +0200

    Apache tests: allow to specify httpd server root has envvar (HTTPD_ROOT)
    (usefull under debian where apache is compiled with an empty server_root)

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index b0a9b3f..0053bc1 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -964,7 +964,7 @@ sub start_apache_server {
     ) );
     my %opt = (
         listen        => $port,
-        server_root   => $info{'HTTPD_ROOT'}
+        server_root   => $info{'HTTPD_ROOT'} || $ENV{'HTTPD_ROOT'}
             || Test::More::BAIL_OUT("Couldn't figure out server root"),
         pid_file      => $pid_fn,
         document_root => $RT::MasonComponentRoot,

commit 4f451bb02c9c509d72fd0f5f4de089ce7f108791
Author: Emmanuel Lacour <elacour at home-dn.net>
Date:   Mon Oct 5 14:09:37 2009 +0200

    Apache tests: better handle builtin modules, sometimes spelled with "mod_" prefix

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 0053bc1..e5e5e1b 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1044,7 +1044,7 @@ sub apache_mod_perl_server_options {
 
     $current->{'load_modules'} = '';
     foreach my $mod ( @mlist ) {
-        next if grep "$mod.c" eq $_, @{ $info{'modules'} };
+        next if grep $_ =~ /^(mod_|)$mod\.c$/, @{ $info{'modules'} };
 
         $current->{'load_modules'} .=
             "LoadModule ${mod}_module modules/mod_${mod}.so\n";
@@ -1064,7 +1064,7 @@ sub apache_fastcgi_server_options {
 
     $current->{'load_modules'} = '';
     foreach my $mod ( @mlist ) {
-        next if grep "$mod.c" eq $_, @{ $info{'modules'} };
+        next if grep $_ =~ /^(mod_|)$mod\.c$/, @{ $info{'modules'} };
 
         $current->{'load_modules'} .=
             "LoadModule ${mod}_module modules/mod_${mod}.so\n";

-----------------------------------------------------------------------