svn commit: r1158895 - /httpd/test/framework/trunk/t/apache/cfg_getline.t

[sf...@apache.org]

Author: sf
Date: Wed Aug 17 20:25:20 2011
New Revision: 1158895

URL: http://svn.apache.org/viewvc?rev=1158895&view=rev
Log:
Correct logic for skipping tests with large line lengths.
The limit for httpd <2.3.15 is 8190, not 8195.

Modified:
    httpd/test/framework/trunk/t/apache/cfg_getline.t

Modified: httpd/test/framework/trunk/t/apache/cfg_getline.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/cfg_getline.t?rev=1158895&r1=1158894&r2=1158895&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/cfg_getline.t (original)
+++ httpd/test/framework/trunk/t/apache/cfg_getline.t Wed Aug 17 20:25:20 2011
@@ -14,16 +14,20 @@ Apache::TestRequest::user_agent(keep_ali
 my $dir_foo = Apache::Test::vars('serverroot') . '/htdocs/cfg_getline';
 
 my @test_cases = (100, 196 .. 202, 396 .. 402 , 596 .. 602 , 1016 .. 1030,
-                  8170 .. 8195);
-
-if (have_min_apache_version("2.3.15")) {
-    push @test_cases, 8196 .. 8200 , 10000, 100000;
-}
+                  8170 .. 8196 , 10000, 100000);
 plan tests => 2 * scalar(@test_cases), need need_lwp,
                                        need_module('mod_include'),
                                        need_module('mod_setenvif');
 
+my $max_len;
+$max_len = 8192 - 2  # trailing \n and \0
+    unless (have_min_apache_version("2.3.15"));
+
 foreach my $len (@test_cases) {
+    if ($max_len && $len > $max_len) {
+        skip "Skipping test with length $len with httpd < 2.3.15" for (1, 2);
+	next;
+    }
 
     my $prefix = 'SetEnvIf User-Agent ^ testvar=';
     my $expect = 'a' x ($len - length($prefix));