database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Update 'abort_not_supported_test' to print a reason why the test was aborted

Browse Source 
and use it in mysql-test-run.pl
Use standard defines as last argument to 'fn_format'


mysql-test/r/not_ndb_default.require:
  Rename: mysql-test/r/true.require -> mysql-test/r/not_ndb_default.require
client/mysqltest.c:
  Use proper defines for last argument to fn_format(they are defined in my_sys.h)
  Make abort_not_supported_test print info about in what file the test was 
  aborted and a reason for it. The reason is a best guess, using the filename of
  the .require file to format it.
mysql-test/include/not_ndb_default.inc:
  Use a more descriptive name of the .require file
mysql-test/include/not_windows.inc:
  Use a more descriptive name of the .require file
mysql-test/include/windows.inc:
  Use a more descriptive name of the .require file
mysql-test/lib/mtr_io.pl:
  Add new function 'mtr_lastlinefromfile' that will return only the last line of a file.
mysql-test/mysql-test-run.pl:
  Get reason why mysqltest decided to abort testcase from mysqltest.log
mysql-test/r/not_windows.require:
  New BitKeeper file ``mysql-test/r/not_windows.require''
mysql-test/r/windows.require:
  New BitKeeper file ``mysql-test/r/windows.require''
This commit is contained in:
unknown
2006-07-19 14:25:52 +02:00
parent 93a56475e1
commit d7b1a5f2a1
9 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.pl
View File

@@ -2330,8 +2330,11 @@ sub run_testcase ($) {
elsif ( $res == 62 )
{
# Testcase itself tell us to skip this one
# FIXME get reason to skip from mysqltest
$tinfo->{'comment'}= "Detected by testcase";
# Try to get reason from mysqltest.log
my $last_line= mtr_lastlinefromfile($path_timefile) if -f $path_timefile;
my $reason= mtr_match_prefix($last_line, "reason: ");
$tinfo->{'comment'}= defined $reason ? $reason : "Detected by testcase(reason unknown) ";
mtr_report_test_skipped($tinfo);
}
elsif ( $res == 63 )