upmerge 14737171 5.1=>5.5

This commit is contained in:
unknown 2012-12-12 15:10:47 +05:30
commit e10d25ef8f

View file

@ -696,7 +696,9 @@ sub run_test_server ($$$) {
else { else {
mtr_report("\nRetrying test $tname, ". mtr_report("\nRetrying test $tname, ".
"attempt($retries/$opt_retry)...\n"); "attempt($retries/$opt_retry)...\n");
my $log_file_name= $opt_vardir."/log/".$result->{shortname}.".log"; #saving the log file as filename.failed in case of retry
my $worker_logdir= $result->{savedir};
my $log_file_name=dirname($worker_logdir)."/".$result->{shortname}.".log";
rename $log_file_name,$log_file_name.".failed"; rename $log_file_name,$log_file_name.".failed";
delete($result->{result}); delete($result->{result});
$result->{retries}= $retries+1; $result->{retries}= $retries+1;