Commit ca503e83 authored by Sergei Golubchik's avatar Sergei Golubchik

mtr: make sphinx skipping a bit less verbose

parent 0df39e60
...@@ -18,24 +18,14 @@ sub locate_sphinx_binary { ...@@ -18,24 +18,14 @@ sub locate_sphinx_binary {
# Look for Sphinx binaries # Look for Sphinx binaries
my $exe_sphinx_indexer = &locate_sphinx_binary('indexer'); my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
return "'indexer' binary not found" unless $exe_sphinx_indexer;
unless ($exe_sphinx_indexer) {
mtr_report("Sphinx 'indexer' binary not found, sphinx suite will be skipped");
return "No Sphinx";
}
my $exe_sphinx_searchd = &locate_sphinx_binary('searchd'); my $exe_sphinx_searchd = &locate_sphinx_binary('searchd');
return "'searchd' binary not found" unless $exe_sphinx_searchd;
unless ($exe_sphinx_searchd) {
mtr_report("Sphinx 'searchd' binary not found, sphinx suite will be skipped");
return "No Sphinx";
}
# Check for Sphinx engine # Check for Sphinx engine
unless ($ENV{HA_SPHINX_SO} or $::mysqld_variables{'sphinx'} eq "ON") { return "SphinxSE not found" unless $ENV{HA_SPHINX_SO} or $::mysqld_variables{'sphinx'} eq "ON";
mtr_report("Sphinx engine not found, sphinx suite will be skipped");
return "No SphinxSE";
}
{ {
local $_ = `"$exe_sphinx_searchd" --help`; local $_ = `"$exe_sphinx_searchd" --help`;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment