diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-13 10:36:47 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-13 10:36:47 +0200 |
| commit | 9cb0a84c7e475302350d64ffd33cb8e61a25737e (patch) | |
| tree | 03742ed180e13428a351bb13a8c27605389af4ec /mysql-test/mysql-test-run.pl | |
| parent | 6bb66c75daf9366ca8e376b8104eb8d0084a2ce3 (diff) | |
| parent | 3aa6d3f51a06145c7aa50af993623758ea7ef482 (diff) | |
| download | mariadb-git-9cb0a84c7e475302350d64ffd33cb8e61a25737e.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Manual merge
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2304a40978c..2d665564034 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3318,9 +3318,12 @@ sub find_testcase_skipped_reason($) { my ($tinfo)= @_; - # Open mysqltest-time - my $F= IO::File->new($path_timefile) or - mtr_error("can't open file \"$path_timefile\": $!"); + # Set default message + $tinfo->{'comment'}= "Detected by testcase(no log file)"; + + # Open mysqltest-time(the mysqltest log file) + my $F= IO::File->new($path_timefile) + or return; my $reason; while ( my $line= <$F> ) @@ -3373,8 +3376,8 @@ sub analyze_testcase_failure($) my ($tinfo)= @_; # Open mysqltest.log - my $F= IO::File->new($path_timefile) or - mtr_error("can't open file \"$path_timefile\": $!"); + my $F= IO::File->new($path_timefile) + or return; while ( my $line= <$F> ) { |