dougm 01/12/14 10:12:25
Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
Log:
unless $self->{opts}->{clean} condition should apply to the whole
'eval {$self->configure} if [EMAIL PROTECTED]' otherwise it is possible that
$@
will be set from the previous eval.
Submitted by: stas
Reviewed by: dougm
Revision Changes Path
1.75 +9 -7
httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- TestRun.pm 2001/12/14 09:20:00 1.74
+++ TestRun.pm 2001/12/14 18:12:25 1.75
@@ -530,13 +530,15 @@
# if configure() fails for some reason before it has flushed the
# config to a file, save it so -clean will be able to clean
- eval { $self->configure } unless $self->{opts}->{clean};
- if ($@) {
- error "configure() has failed:\n$@";
- warning "forcing Apache::TestConfig object save";
- $self->{test_config}->save;
- warning "run 't/TEST -clean' to clean up before continuing";
- exit;
+ unless ($self->{opts}->{clean}) {
+ eval { $self->configure };
+ if ($@) {
+ error "configure() has failed:\n$@";
+ warning "forcing Apache::TestConfig object save";
+ $self->{test_config}->save;
+ warning "run 't/TEST -clean' to clean up before continuing";
+ exit 1;
+ }
}
if ($self->{opts}->{configure}) {
