Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b2b6cf49
Commit
b2b6cf49
authored
Jan 04, 2017
by
Elena Stepanova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-10988 Sphinx test suite refuses to run silently
Add diagnostics output if any Sphinx components aren't found
parent
f0c19b6a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
4 deletions
+17
-4
storage/sphinx/mysql-test/sphinx/suite.pm
storage/sphinx/mysql-test/sphinx/suite.pm
+17
-4
No files found.
storage/sphinx/mysql-test/sphinx/suite.pm
View file @
b2b6cf49
...
...
@@ -16,13 +16,26 @@ sub locate_sphinx_binary {
for
(
@list
)
{
return
$_
if
-
x
$_
;
}
}
# Look for Sphinx binaries
.
# Look for Sphinx binaries
my
$exe_sphinx_indexer
=
&
locate_sphinx_binary
('
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
');
return
"
No Sphinx
"
unless
$exe_sphinx_indexer
and
$exe_sphinx_searchd
;
return
"
No SphinxSE
"
unless
$ENV
{
HA_SPHINX_SO
}
or
$::mysqld_variables
{'
sphinx
'}
eq
"
ON
";
unless
(
$exe_sphinx_searchd
)
{
mtr_report
("
Sphinx 'searchd' binary not found, sphinx suite will be skipped
");
return
"
No Sphinx
";
}
# Check for Sphinx engine
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
`;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment