[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    svn commit: r947563 - /httpd/test/framework/trunk/t/modules/info.t
From:       sf () apache ! org
Date:       2010-05-24 8:40:14
Message-ID: 20100524084014.D886223889D7 () eris ! apache ! org
[Download RAW message or body]

Author: sf
Date: Mon May 24 08:40:14 2010
New Revision: 947563

URL: http://svn.apache.org/viewvc?rev=947563&view=rev
Log:
Make test work both with shared and non-shared builds.

Modified:
    httpd/test/framework/trunk/t/modules/info.t

Modified: httpd/test/framework/trunk/t/modules/info.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/info.t?rev=947563&r1=947562&r2=947563&view=diff
 ==============================================================================
--- httpd/test/framework/trunk/t/modules/info.t (original)
+++ httpd/test/framework/trunk/t/modules/info.t Mon May 24 08:40:14 2010
@@ -19,21 +19,23 @@ my (@actual,@expected) = ((),());
 ## extract module names from html ##
 foreach (split /\n/, $info) {
     if ($_ =~ /<a name=\"(\w+\.c)\">/) {
-        my $name = $1;
-        if ($name eq 'util_ldap.c') {
+        if ($1 eq 'util_ldap.c') {
             push(@actual,'mod_ldap.c');
-        } elsif ($name =~ /^(?:event|prefork|worker)\.c$/) {
-            push(@actual,"mod_mpm_$name");
-        } elsif ($name eq 'simple_api.c') {
-            push(@actual,"mod_mpm_simple.c");
         } else {
-            push(@actual, $name);
+            push(@actual, $1);
         }
     }
 }
 
 foreach (sort keys %$mods) {
-    push(@expected,$_) if $mods->{$_} && !$config->should_skip_module($_);
+    ($mods->{$_} && !$config->should_skip_module($_)) or next;
+    if ($_ =~ /^mod_mpm_(event|prefork|worker)\.c$/) {
+        push(@expected,"$1.c");
+    } elsif ($_ eq 'mod_mpm_simple.c') {
+        push(@expected,'simple_api.c');
+    } else {
+        push(@expected,$_);
+    }
 }
 @actual = sort @actual;
 @expected = sort @expected;


[prev in list] [next in list] [prev in thread] [next in thread]