You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by ph...@apache.org on 2009/04/18 11:48:19 UTC

svn commit: r766281 - in /perl/Apache-Test/tags/1_30: Changes lib/Apache/TestConfig.pm

Author: phred
Date: Sat Apr 18 09:48:19 2009
New Revision: 766281

URL: http://svn.apache.org/viewvc?rev=766281&view=rev
Log:
Revert earlier change - my environment was on the 1_30 tag, not trunk

Modified:
    perl/Apache-Test/tags/1_30/Changes
    perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm

Modified: perl/Apache-Test/tags/1_30/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/Changes?rev=766281&r1=766280&r2=766281&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/Changes (original)
+++ perl/Apache-Test/tags/1_30/Changes Sat Apr 18 09:48:19 2009
@@ -8,11 +8,6 @@
 
 =item 1.31-dev
 
-Prevent infinite loop when no default apxs or httpd is present and repeated
-attempts to run the test suite under an automated harness (such as a cpan 
-smoke test).  Issue reported by CORION and ANDK, PR: 12911
-[Fred Moyer <fred@redhotpenguin.com]
-
 Use need_module('mod_cgi.c') and need_module('mod_cgid.c') in 
 t/next_available_port.t instead of need_cgi.  On case insensitive file
 systems such as OS X, need_cgi will fulfill the requirement with cgi.pm,

Modified: perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm?rev=766281&r1=766280&r2=766281&view=diff
==============================================================================
--- perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm (original)
+++ perl/Apache-Test/tags/1_30/lib/Apache/TestConfig.pm Sat Apr 18 09:48:19 2009
@@ -2406,18 +2406,7 @@
         $prompt .= ":\n\n";
     }
 
-    my $i = 0;
     while (1) {
-
-        # prevent infinite loops in smoke tests, only give the user
-        # five chances to specify httpd or apxs before giving up
-        if ($i++ == 5) {
-
-            Apache::TestRun::skip_test_suite('y');
-            return;
-        }
-
-
         $ans = ExtUtils::MakeMaker::prompt($prompt, $default);
 
         # strip leading/closing spaces