svn commit: r1838488 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/alias.t

[ja...@apache.org]

Author: jailletc36
Date: Mon Aug 20 20:49:17 2018
New Revision: 1838488

URL: http://svn.apache.org/viewvc?rev=1838488&view=rev
Log:
Folow-up to r1829008.

Alias, Redirect and ScriptAlias  in LocationMatch are supported only since 2.4.19 (see https://httpd.apache.org/docs/2.4/mod/mod_alias.html), as reported by pgajdos <pgajdos suse.cz>.

While at it, reorder to way the number of tests is computed to match the order the tests are performed to ease the understanding.
One of these tests depends on !WINFU.

Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in
    httpd/test/framework/trunk/t/modules/alias.t

Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1838488&r1=1838487&r2=1838488&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Mon Aug 20 20:49:17 2018
@@ -389,7 +389,7 @@
     ScriptAliasMatch /aliascgi-(.*) @SERVERROOT@/htdocs/modules/alias/$1
 
     <IfDefine APACHE2>
-        <IfVersion >= 2.4.8>
+        <IfVersion >= 2.4.19>
             <LocationMatch /expr/ali(?<number>[0-9])>
                 Alias @SERVERROOT@/htdocs/modules/alias/%{env:MATCH_NUMBER}.html
             </LocationMatch>

Modified: httpd/test/framework/trunk/t/modules/alias.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/alias.t?rev=1838488&r1=1838487&r2=1838488&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/alias.t (original)
+++ httpd/test/framework/trunk/t/modules/alias.t Mon Aug 20 20:49:17 2018
@@ -36,10 +36,13 @@ my %rm_rc = (
 );
 
 #XXX: find something that'll on other platforms (/bin/sh aint it)
-my $script_tests = WINFU ? 0 : 4;
+my $script_tests = WINFU ? 0 : 4 + have_min_apache_version("2.4.19");
 
-my $tests = (keys %redirect) + (keys %rm_body) * (1 + have_min_apache_version("2.4.8")) * 10 +
-            (keys %rm_rc) * (1 + have_min_apache_version("2.4.8")) * 10 + have_min_apache_version("2.4.8") * 11 + 12 + $script_tests;
+my $tests = 12 + have_min_apache_version("2.4.19") * 10 +
+            (keys %redirect) +
+            (keys %rm_body) * (1 + have_min_apache_version("2.4.19")) * 10 +
+            (keys %rm_rc) * (1 + have_min_apache_version("2.4.19")) * 10 +
+            $script_tests;
 
 #LWP required to follow redirects
 plan tests => $tests, need need_module('alias'), need_lwp;
@@ -62,7 +65,7 @@ for (my $i=0 ; $i <= 9 ; $i++) {
              "/ali$i");
 }
 
-if (have_min_apache_version("2.4.8")) {
+if (have_min_apache_version("2.4.19")) {
     t_debug "verifying expression alias match with /expr/ali[0-9].";
     for (my $i=0 ; $i <= 9 ; $i++) {
         ok t_cmp((GET_BODY "/expr/ali$i"),
@@ -95,7 +98,7 @@ foreach (sort keys %rm_body) {
     }
 }
 
-if (have_min_apache_version("2.4.8")) {
+if (have_min_apache_version("2.4.19")) {
     print "verifying body of perm and temp redirect match with expression support\n";
     foreach (sort keys %rm_body) {
         for (my $i=0 ; $i <= 9 ; $i++) {
@@ -123,7 +126,7 @@ foreach (keys %rm_rc) {
     }
 }
 
-if (have_min_apache_version("2.4.8")) {
+if (have_min_apache_version("2.4.19")) {
     print "verifying return code of seeother and gone redirect match with expression support\n";
     foreach (keys %rm_rc) {
         ## make LWP not follow the redirect since we
@@ -183,7 +186,7 @@ else {
     skip "skipping test without CGI module";
 }
 
-if (have_min_apache_version("2.4.8")) {
+if (have_min_apache_version("2.4.19")) {
     if (have_cgi) {
         ## with ScriptAlias in LocationMatch ##
         t_debug "verifying ScriptAlias in LocationMatch with /expr/aliascgi-script";