Skip to content

Commit ca503e8

Browse files
committed
mtr: make sphinx skipping a bit less verbose
1 parent 0df39e6 commit ca503e8

File tree

1 file changed

+3
-13
lines changed
  • storage/sphinx/mysql-test/sphinx

1 file changed

+3
-13
lines changed

storage/sphinx/mysql-test/sphinx/suite.pm

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,14 @@ sub locate_sphinx_binary {
1818

1919
# Look for Sphinx binaries
2020
my $exe_sphinx_indexer = &locate_sphinx_binary('indexer');
21+
return "'indexer' binary not found" unless $exe_sphinx_indexer;
2122

22-
unless ($exe_sphinx_indexer) {
23-
mtr_report("Sphinx 'indexer' binary not found, sphinx suite will be skipped");
24-
return "No Sphinx";
25-
}
2623
my $exe_sphinx_searchd = &locate_sphinx_binary('searchd');
27-
28-
unless ($exe_sphinx_searchd) {
29-
mtr_report("Sphinx 'searchd' binary not found, sphinx suite will be skipped");
30-
return "No Sphinx";
31-
}
24+
return "'searchd' binary not found" unless $exe_sphinx_searchd;
3225

3326
# Check for Sphinx engine
3427

35-
unless ($ENV{HA_SPHINX_SO} or $::mysqld_variables{'sphinx'} eq "ON") {
36-
mtr_report("Sphinx engine not found, sphinx suite will be skipped");
37-
return "No SphinxSE";
38-
}
28+
return "SphinxSE not found" unless $ENV{HA_SPHINX_SO} or $::mysqld_variables{'sphinx'} eq "ON";
3929

4030
{
4131
local $_ = `"$exe_sphinx_searchd" --help`;

0 commit comments

Comments
 (0)