Author: stas Date: Thu Nov 25 06:57:40 2004 New Revision: 106576 URL: http://svn.apache.org/viewcvs?view=rev&rev=106576 Log: Don't run interactive prompts when STDIN is closed
Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/Changes Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/Changes?view=diff&rev=106576&p1=httpd/test/trunk/perl-framework/Apache-Test/Changes&r1=106575&p2=httpd/test/trunk/perl-framework/Apache-Test/Changes&r2=106576 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/Changes (original) +++ httpd/test/trunk/perl-framework/Apache-Test/Changes Thu Nov 25 06:57:40 2004 @@ -8,6 +8,8 @@ =item 1.17-dev +Don't run interactive prompts when STDIN is closed [Stas] + Add LockFile directive in the autogenerated httpd.conf, which points to t/logs, to handle the case where LockFile is hardcoded at compile time to some other directory on the system. [Stas] Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm?view=diff&rev=106576&p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm&r1=106575&p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm&r2=106576 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestConfig.pm Thu Nov 25 06:57:40 2004 @@ -2090,6 +2090,11 @@ my $self = shift; my $conf_opts = shift; + unless (-t STDIN) { + error "STDIN is closed, can't run interactive config"; + Apache::TestRun::skip_test_suite(); + } + my $vars = $self->{vars}; print qq[ Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm?view=diff&rev=106576&p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm&r1=106575&p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm&r2=106576 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRun.pm Thu Nov 25 06:57:40 2004 @@ -1284,6 +1284,9 @@ sub skip_test_suite { my $no_doubt = shift; + # we can't prompt when there is no STDIN; + $no_doubt = 1 unless -t STDIN; + print qq[ Running the test suite is important to make sure that the module that