Mailing-List: contact test-commits-help@perl.apache.org; run by ezmlm
Precedence: bulk
Reply-To: test-dev@perl.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r933775 -
 /perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm
Date: Tue, 13 Apr 2010 20:47:37 -0000
To: test-commits@perl.apache.org
From: phred@apache.org
Message-Id: <20100413204738.069DF238890B@eris.apache.org>

Author: phred
Date: Tue Apr 13 20:47:37 2010
New Revision: 933775

URL: http://svn.apache.org/viewvc?rev=933775&view=rev
Log:
Fix error with new feature where test was failing if libapreq was not
installed.

Submitted by: Philippe M. Chiasson
Applied by:   Fred Moyer
Tested by:    Fred Moyer

Modified:
    perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm

Modified: perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm?rev=933775&r1=933774&r2=933775&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRunPerl.pm Tue Apr 13 20:47:37 2010
@@ -78,14 +78,15 @@ sub configure_modperl {
         # do things a bit differently that find_and_load_module()
         # because apreq2 can't be loaded that way (the 2 causes a problem)
         my $name = 'mod_apreq2.so';
-        my $mod_path = $test_config->find_apache_module($name) or return;
+        if (my $mod_path = $test_config->find_apache_module($name)) {
 
-        # don't match the 2 here
-        my ($sym) = $name =~ m/mod_(\w+)2\./;
+            # don't match the 2 here
+            my ($sym) = $name =~ m/mod_(\w+)2\./;
 
-        if ($mod_path && -e $mod_path) {
-            $test_config->preamble(IfModule => "!mod_$sym.c",
-                        qq{LoadModule ${sym}_module "$mod_path"\n});
+            if ($mod_path && -e $mod_path) {
+                $test_config->preamble(IfModule => "!mod_$sym.c",
+                            qq{LoadModule ${sym}_module "$mod_path"\n});
+            }
         }
     }