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

Fixed wrong filenames in maria unittest that caused unittest to fail

Browse Source 
mysql-test/suite/sphinx/suite.pm:
  Update test to support 1.10-beta
storage/maria/unittest/ma_test_all-t:
  Fixed old filenames
This commit is contained in:
Michael Widenius
2011-03-01 13:37:29 +02:00
parent 64ceea7a56
commit 9f2194090c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/sphinx/suite.pm
View File

@@ -29,8 +29,18 @@ return "No SphinxSE" unless $ENV{HA_SPHINX_SO} or
{ {
local $_ = `"$exe_sphinx_searchd" --help`; local $_ = `"$exe_sphinx_searchd" --help`;
print "tool: $exe_sphinx_searchd\n";
my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)\.([0-9]+)/); my $ver = sprintf "%04d.%04d.%04d", (/([0-9]+)\.([0-9]+)\.([0-9]+)/);
print $ver;
if ($ver eq "0000.0000.0000")
{
$ver = sprintf "%04d.%04d", (/([0-9]+)\.([0-9]+)-(alpha|beta|gamma|RC)/);
return "Sphinx 0.9.9 or later is needed" unless $ver ge '0001.0010';
}
else
{
return "Sphinx 0.9.9 or later is needed" unless $ver ge '0000.0009.0009'; return "Sphinx 0.9.9 or later is needed" unless $ver ge '0000.0009.0009';
}
} }
############# action methods ###################### ############# action methods ######################

4
storage/maria/unittest/ma_test_all-t
View File

@@ -497,10 +497,10 @@ sub run_tests_on_clrs
my @t= ($NEW_TEST, my @t= ($NEW_TEST,
"$maria_exe_path/ma_test2$suffix -h$tmpdir -s -L -K -W -P -M -T -c -b -t2 -A1", "$maria_exe_path/ma_test2$suffix -h$tmpdir -s -L -K -W -P -M -T -c -b -t2 -A1",
"cp $tmpdir/maria_log_control $tmpdir/maria_log_control.backup", "cp $tmpdir/aria_log_control $tmpdir/aria_log_control.backup",
"$maria_exe_path/aria_read_log$suffix -a -s -h$tmpdir", "$maria_exe_path/aria_read_log$suffix -a -s -h$tmpdir",
"$maria_exe_path/aria_chk$suffix -h$tmpdir -s -e $tmpdir/test2", "$maria_exe_path/aria_chk$suffix -h$tmpdir -s -e $tmpdir/test2",
"mv $tmpdir/maria_log_control.backup $tmpdir/maria_log_control", "mv $tmpdir/aria_log_control.backup $tmpdir/aria_log_control",
"rm $tmpdir/test2.MA?", "rm $tmpdir/test2.MA?",
"$maria_exe_path/aria_read_log$suffix -a -s -h$tmpdir", "$maria_exe_path/aria_read_log$suffix -a -s -h$tmpdir",
"$maria_exe_path/aria_chk$suffix -h$tmpdir -s -e $tmpdir/test2", "$maria_exe_path/aria_chk$suffix -h$tmpdir -s -e $tmpdir/test2",