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
c2f6d59d
Commit
c2f6d59d
authored
Oct 05, 2007
by
msvensson@shellback.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
parents
c78ef412
6132e828
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
6 deletions
+35
-6
mysql-test/lib/mtr_cases.pl
mysql-test/lib/mtr_cases.pl
+25
-3
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+7
-3
mysql-test/t/mysqltest.test
mysql-test/t/mysqltest.test
+3
-0
No files found.
mysql-test/lib/mtr_cases.pl
View file @
c2f6d59d
...
...
@@ -28,6 +28,26 @@ sub collect_one_test_case ($$$$$$$$$);
sub
mtr_options_from_test_file
($$);
my
$do_test
;
my
$skip_test
;
sub
init_pattern
{
my
(
$from
,
$what
)
=
@_
;
if
(
$from
=~
/[a-z0-9]/
)
{
# Does not contain any regex, make the pattern match
# beginning of string
$from
=
"
^
$from
";
}
else
{
# Check that pattern is a valid regex
eval
{
""
=~
/$from/
;
1
}
or
mtr_error
("
Invalid regex '
$from
' passed to
$what
\n
Perl says: $@
");
}
return
$from
;
}
##############################################################################
#
# Collect information about test cases we are to run
...
...
@@ -35,6 +55,9 @@ sub mtr_options_from_test_file($$);
##############################################################################
sub
collect_test_cases
($)
{
$do_test
=
init_pattern
(
$::opt_do_test
,
"
--do-test
");
$skip_test
=
init_pattern
(
$::opt_skip_test
,
"
--skip-test
");
my
$suites
=
shift
;
# Semicolon separated list of test suites
my
$cases
=
[]
;
# Array of hash
...
...
@@ -303,8 +326,7 @@ sub collect_one_suite($$)
}
# Skip tests that does not match the --do-test= filter
next
if
$::opt_do_test
and
!
defined
mtr_match_prefix
(
$elem
,
$::opt_do_test
);
next
if
(
$do_test
and
not
$tname
=~
/$do_test/o
);
collect_one_test_case
(
$testdir
,
$resdir
,
$suite
,
$tname
,
$elem
,
$cases
,
\%
disabled
,
$component_id
,
...
...
@@ -357,7 +379,7 @@ sub collect_one_test_case($$$$$$$$$) {
# Skip some tests but include in list, just mark them to skip
# ----------------------------------------------------------------------
if
(
$
::opt_skip_test
and
defined
mtr_match_prefix
(
$tname
,
$::opt_skip_test
)
)
if
(
$
skip_test
and
$tname
=~
/$skip_test/o
)
{
$tinfo
->
{'
skip
'}
=
1
;
return
;
...
...
mysql-test/mysql-test-run.pl
View file @
c2f6d59d
...
...
@@ -5044,7 +5044,7 @@ sub valgrind_arguments {
}
# Add valgrind options, can be overriden by user
mtr_add_arg
(
$args
,
'
%s
',
$
_
)
for
(
split
('
',
$opt_valgrind_options
)
);
mtr_add_arg
(
$args
,
'
%s
',
$
opt_valgrind_options
);
mtr_add_arg
(
$args
,
$$exe
);
...
...
@@ -5117,14 +5117,18 @@ Options to control what test suites or cases to run
skip-ndb[cluster] Skip all tests that need cluster
skip-ndb[cluster]-slave Skip all tests that need a slave cluster
ndb-extra Run extra tests from ndb directory
do-test=PREFIX Run test cases which name are prefixed with PREFIX
do-test=PREFIX or REGEX
Run test cases which name are prefixed with PREFIX
or fulfills REGEX
skip-test=PREFIX or REGEX
Skip test cases which name are prefixed with PREFIX
or fulfills REGEX
start-from=PREFIX Run test cases starting from test prefixed with PREFIX
suite[s]=NAME1,..,NAMEN Collect tests in suites from the comma separated
list of suite names.
The default is: "$opt_suites"
skip-rpl Skip the replication test cases.
skip-im Don't start IM, and skip the IM test cases
skip-test=PREFIX Skip test cases which name are prefixed with PREFIX
big-test Set the environment variable BIG_TEST, which can be
checked from test cases.
...
...
mysql-test/t/mysqltest.test
View file @
c2f6d59d
...
...
@@ -1435,7 +1435,10 @@ select "this will be executed";
--
exec
$MYSQL_TEST
-
x
$MYSQLTEST_VARDIR
/
tmp
/
query
.
sql
-
R
$MYSQLTEST_VARDIR
/
tmp
/
zero_length_file
.
result
>
/
dev
/
null
2
>&
1
remove_file
$MYSQLTEST_VARDIR
/
tmp
/
zero_length_file
.
result
;
--
error
0
,
1
remove_file
$MYSQLTEST_VARDIR
/
log
/
zero_length_file
.
reject
;
--
error
0
,
1
remove_file
$MYSQL_TEST_DIR
/
r
/
zero_length_file
.
reject
;
#
# Test that a test file that does not generate any output fails.
...
...
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