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
7b4a8e41
Commit
7b4a8e41
authored
Nov 03, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well.
parent
580b540d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
21 deletions
+23
-21
mysql-test/lib/mtr_misc.pl
mysql-test/lib/mtr_misc.pl
+21
-20
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+2
-1
No files found.
mysql-test/lib/mtr_misc.pl
View file @
7b4a8e41
...
...
@@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) {
##############################################################################
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
#
# NOTE! More specific paths should be given before less specific.
# For example /client/debug should be listed before /client
#
sub
mtr_path_exists
(@)
{
foreach
my
$path
(
@_
)
{
...
...
@@ -84,9 +85,11 @@ sub mtr_path_exists (@) {
}
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
#
# NOTE! More specific paths should be given before less specific.
# For example /client/debug should be listed before /client
#
sub
mtr_script_exists
(@)
{
foreach
my
$path
(
@_
)
{
...
...
@@ -109,17 +112,11 @@ sub mtr_script_exists (@) {
}
}
sub
mtr_file_exists
(@)
{
foreach
my
$path
(
@_
)
{
return
$path
if
-
e
$path
;
}
return
"";
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
#
# NOTE! More specific paths should be given before less specific.
# For example /client/debug should be listed before /client
#
sub
mtr_file_exists
(@)
{
foreach
my
$path
(
@_
)
{
...
...
@@ -128,9 +125,11 @@ sub mtr_file_exists (@) {
return
"";
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
#
# NOTE! More specific paths should be given before less specific.
# For example /client/debug should be listed before /client
#
sub
mtr_exe_maybe_exists
(@)
{
my
@path
=
@_
;
...
...
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) {
return
"";
}
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
#
# NOTE! More specific paths should be given before less specific.
# For example /client/debug should be listed before /client
#
sub
mtr_exe_exists
(@)
{
my
@path
=
@_
;
if
(
my
$path
=
mtr_exe_maybe_exists
(
@path
))
...
...
@@ -174,7 +175,7 @@ sub mtr_copy_dir($$) {
my
$from_dir
=
shift
;
my
$to_dir
=
shift
;
#
mtr_verbose("Copying from $from_dir to $to_dir");
#
mtr_verbose("Copying from $from_dir to $to_dir");
mkpath
("
$to_dir
");
opendir
(
DIR
,
"
$from_dir
")
...
...
mysql-test/mysql-test-run.pl
View file @
7b4a8e41
...
...
@@ -670,7 +670,8 @@ sub command_line_setup () {
$path_client_bindir
=
mtr_path_exists
(
vs_config_dirs
('
client
',
''),
"
$glob_basedir
/client_release
",
"
$glob_basedir
/client_debug
",
"
$glob_basedir
/client
");
"
$glob_basedir
/client
",
"
$glob_basedir
/bin
");
$exe_mysqld
=
mtr_exe_exists
(
vs_config_dirs
('
sql
',
'
mysqld
'),
"
$glob_basedir
/sql/mysqld
",
...
...
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