dougm 01/07/23 13:43:16 Modified: Apache-Test/lib/Apache TestConfig.pm TestServer.pm Log: need to test -e full path to t/logs/error_log for when t/TEST chdir into t/ Revision Changes Path 1.11 +3 -3 modperl-2.0/Apache-Test/lib/Apache/TestConfig.pm Index: TestConfig.pm =================================================================== RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestConfig.pm,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- TestConfig.pm 2001/04/20 16:46:50 1.10 +++ TestConfig.pm 2001/07/23 20:43:16 1.11 @@ -574,10 +574,10 @@ sub error_log { my($self, $rel) = @_; my $file = catfile $self->{vars}->{t_logs}, 'error_log'; - return $file unless $rel; - return abs2rel $file, $self->{vars}->{top_dir}; + my $rfile = abs2rel $file, $self->{vars}->{top_dir}; + return wantarray ? ($file, $rfile) : + $rel ? $rfile : $file; } - #utils 1.15 +3 -3 modperl-2.0/Apache-Test/lib/Apache/TestServer.pm Index: TestServer.pm =================================================================== RCS file: /home/cvs/modperl-2.0/Apache-Test/lib/Apache/TestServer.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TestServer.pm 2001/07/23 20:38:22 1.14 +++ TestServer.pm 2001/07/23 20:43:16 1.15 @@ -272,10 +272,10 @@ sub failed_msg { my $self = shift; - my $log = $self->{config}->error_log(1); + my($log, $rlog) = $self->{config}->error_log; my $log_file_info = -e $log ? - "please examine $log" : - "$log wasn't created, start the server in the debug mode"; + "please examine $rlog" : + "$rlog wasn't created, start the server in the debug mode"; error "@_ ($log_file_info)"; }