Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1200605 - /httpd/test/framework/trunk/t/apache/expr.t
Date: Thu, 10 Nov 2011 22:34:47 -0000
To: cvs@httpd.apache.org
From: sf@apache.org
Message-Id: <20111110223447.2CE2523888EA@eris.apache.org>

Author: sf
Date: Thu Nov 10 22:34:46 2011
New Revision: 1200605

URL: http://svn.apache.org/viewvc?rev=1200605&view=rev
Log:
Fix stack overflow on AIX differently by reducing the number of recursions

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

Modified: httpd/test/framework/trunk/t/apache/expr.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/expr.t?rev=1200605&r1=1200604&r2=1200605&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/expr.t (original)
+++ httpd/test/framework/trunk/t/apache/expr.t Thu Nov 10 22:34:46 2011
@@ -195,22 +195,16 @@ if (have_min_apache_version("2.3.15")) {
     # should support long expressions
     $long_expr= 1;
 }
+my $spaces = " " x 100;
 push(@test_cases,
      # longest string/regex with 2.3.15+ is 8191
+     [("true && $spaces" x 100) . "true" => $long_expr ? 1 : undef],
      ["-n '" . ("a" x 8191) . "'"        => $long_expr ? 1 : undef],
      ["-n '" . ("a" x 9000) . "'"        => undef],
      ["'y' =~ /" . ("a" x 8191) . "/"    => $long_expr ? 0 : undef],
      ["'y' =~ /" . ("a" x 9000) . "/x"   => undef],
 );
 
-# Instead of testing the entire server with large non-default
-# stack-size, just skip this recursion heavy test on AIX 
-# (Default = 96k, required between 256 and 384)
-if (!Apache::TestConfig::AIX) { 
-    push(@test_cases,
-        [("true && " x 2000) . "true"       => $long_expr ? 1 : undef]);
-}
-
 plan tests => scalar(@test_cases) + 1,
                   need need_lwp,
                   need_module('mod_authz_core'),