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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3941355d
Commit
3941355d
authored
Jul 02, 2012
by
Joerg Bruehe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added some extra optional path to test suites.
parent
72c642c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
mysql-test/lib/My/Find.pm
mysql-test/lib/My/Find.pm
+4
-3
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+4
-1
No files found.
mysql-test/lib/My/Find.pm
View file @
3941355d
...
@@ -126,9 +126,9 @@ sub my_find_file {
...
@@ -126,9 +126,9 @@ sub my_find_file {
#
#
#
#
sub
my_find_dir
{
sub
my_find_dir
{
my
(
$base
,
$paths
,
$dirs
,
$
required
)
=
@_
;
my
(
$base
,
$paths
,
$dirs
,
$
optional
)
=
@_
;
croak
"
usage: my_find_dir(<base>, <paths>[, <dirs>])
"
croak
"
usage: my_find_dir(<base>, <paths>[, <dirs>
[, <optional>]
])
"
unless
(
@_
==
3
or
@_
==
2
);
unless
(
@_
==
3
or
@_
==
2
or
@_
==
4
);
# -------------------------------------------------------
# -------------------------------------------------------
# Find and return the first directory
# Find and return the first directory
...
@@ -136,6 +136,7 @@ sub my_find_dir {
...
@@ -136,6 +136,7 @@ sub my_find_dir {
foreach
my
$path
(
my_find_paths
(
$base
,
$paths
,
$dirs
))
{
foreach
my
$path
(
my_find_paths
(
$base
,
$paths
,
$dirs
))
{
return
$path
if
(
-
d
$path
);
return
$path
if
(
-
d
$path
);
}
}
return
""
if
$optional
;
find_error
(
$base
,
$paths
,
$dirs
);
find_error
(
$base
,
$paths
,
$dirs
);
}
}
...
...
mysql-test/lib/mtr_cases.pm
View file @
3941355d
...
@@ -137,6 +137,7 @@ sub collect_test_cases ($$$$) {
...
@@ -137,6 +137,7 @@ sub collect_test_cases ($$$$) {
{
{
push
(
@$cases
,
collect_one_suite
(
$suite
,
$opt_cases
,
$opt_skip_test_list
));
push
(
@$cases
,
collect_one_suite
(
$suite
,
$opt_cases
,
$opt_skip_test_list
));
last
if
$some_test_found
;
last
if
$some_test_found
;
push
(
@$cases
,
collect_one_suite
("
i_
"
.
$suite
,
$opt_cases
,
$opt_skip_test_list
));
}
}
}
}
...
@@ -288,13 +289,15 @@ sub collect_one_suite($)
...
@@ -288,13 +289,15 @@ sub collect_one_suite($)
$suitedir
=
my_find_dir
(
$::basedir
,
$suitedir
=
my_find_dir
(
$::basedir
,
["
share/mysql-test/suite
",
["
share/mysql-test/suite
",
"
mysql-test/suite
",
"
mysql-test/suite
",
"
internal/mysql-test/suite
",
"
mysql-test
",
"
mysql-test
",
# Look in storage engine specific suite dirs
# Look in storage engine specific suite dirs
"
storage/*/mtr
",
"
storage/*/mtr
",
# Look in plugin specific suite dir
# Look in plugin specific suite dir
"
plugin/
$suite
/tests
",
"
plugin/
$suite
/tests
",
],
],
[
$suite
,
"
mtr
"]);
[
$suite
,
"
mtr
"],
(
$suite
=~
/^i_/
));
return
unless
$suitedir
;
}
}
mtr_verbose
("
suitedir:
$suitedir
");
mtr_verbose
("
suitedir:
$suitedir
");
}
}
...
...
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