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
6f010118
Commit
6f010118
authored
Feb 06, 2012
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove few hard-coded checks from mtr
parent
dfafb7bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
36 deletions
+1
-36
mysql-test/lib/mtr_cases.pm
mysql-test/lib/mtr_cases.pm
+0
-35
mysql-test/t/ssl_cipher-master.opt
mysql-test/t/ssl_cipher-master.opt
+1
-1
No files found.
mysql-test/lib/mtr_cases.pm
View file @
6f010118
...
@@ -967,37 +967,6 @@ sub collect_one_test_case {
...
@@ -967,37 +967,6 @@ sub collect_one_test_case {
}
}
}
}
if
(
$::opt_embedded_server
)
{
if
(
$tinfo
->
{'
not_embedded
'}
)
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
Not run for embedded server
";
return
$tinfo
;
}
}
if
(
$tinfo
->
{'
not_valgrind
'}
)
{
if
(
$::opt_valgrind_mysqld
)
{
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
Not compatible with Valgrind testing
";
return
$tinfo
;
}
}
if
(
$tinfo
->
{'
need_ssl
'}
)
{
# This is a test that needs ssl
if
(
!
$::opt_ssl_supported
)
{
# SSL is not supported, skip it
$tinfo
->
{'
skip
'}
=
1
;
$tinfo
->
{'
comment
'}
=
"
No SSL support
";
return
$tinfo
;
}
}
if
(
$tinfo
->
{'
need_ipv6
'}
)
if
(
$tinfo
->
{'
need_ipv6
'}
)
{
{
# This is a test that needs ssl
# This is a test that needs ssl
...
@@ -1059,14 +1028,10 @@ sub collect_one_test_case {
...
@@ -1059,14 +1028,10 @@ sub collect_one_test_case {
my
$tags_map
=
{'
big_test
'
=>
['
big_test
',
1
],
my
$tags_map
=
{'
big_test
'
=>
['
big_test
',
1
],
'
have_debug
'
=>
['
need_debug
',
1
],
'
have_ndb
'
=>
['
ndb_test
',
1
],
'
have_ndb
'
=>
['
ndb_test
',
1
],
'
have_multi_ndb
'
=>
['
ndb_test
',
1
],
'
have_multi_ndb
'
=>
['
ndb_test
',
1
],
'
master-slave
'
=>
['
rpl_test
',
1
],
'
master-slave
'
=>
['
rpl_test
',
1
],
'
ndb_master-slave
'
=>
['
rpl_test
',
1
,
'
ndb_test
',
1
],
'
ndb_master-slave
'
=>
['
rpl_test
',
1
,
'
ndb_test
',
1
],
'
not_embedded
'
=>
['
not_embedded
',
1
],
'
not_valgrind
'
=>
['
not_valgrind
',
1
],
'
have_ssl
'
=>
['
need_ssl
',
1
],
'
check_ipv6
'
=>
['
need_ipv6
',
1
],
'
check_ipv6
'
=>
['
need_ipv6
',
1
],
'
long_test
'
=>
['
long_test
',
1
],
'
long_test
'
=>
['
long_test
',
1
],
};
};
...
...
mysql-test/t/ssl_cipher-master.opt
View file @
6f010118
--ssl-cipher=AES128-SHA
--
loose-
ssl-cipher=AES128-SHA
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