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
b91a123d
Commit
b91a123d
authored
Feb 23, 2022
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend have_sanitizer with ASAN+UBSAN and MSAN
Disable some tests that are too slow or big for MSAN.
parent
23368b76
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
11 deletions
+27
-11
mysql-test/include/not_asan.inc
mysql-test/include/not_asan.inc
+1
-1
mysql-test/include/not_msan.inc
mysql-test/include/not_msan.inc
+6
-0
mysql-test/include/not_ubsan.inc
mysql-test/include/not_ubsan.inc
+1
-1
mysql-test/include/rpl_stop_server.inc
mysql-test/include/rpl_stop_server.inc
+3
-1
mysql-test/main/sum_distinct-big.test
mysql-test/main/sum_distinct-big.test
+1
-0
mysql-test/suite/binlog/t/flashback-largebinlog.test
mysql-test/suite/binlog/t/flashback-largebinlog.test
+1
-1
mysql-test/suite/maria/max_length.test
mysql-test/suite/maria/max_length.test
+1
-0
sql/sys_vars.cc
sql/sys_vars.cc
+13
-7
No files found.
mysql-test/include/not_asan.inc
View file @
b91a123d
...
...
@@ -2,7 +2,7 @@
# be overcome. In normal cases one should fix the bug server/test case or in
# the worst case add a (temporary?) suppression in asan.supp or lsan.supp
if
(
`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value
="ASAN
"`
)
if
(
`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value
like "ASAN%
"`
)
{
--
skip
Can
'
t
be
run
with
ASan
}
mysql-test/include/not_msan.inc
0 → 100644
View file @
b91a123d
# This file should only be used with tests that are too big or slow for MSAN.
if
(
`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`
)
{
--
skip
Can
'
t
be
run
WITH_MSAN
}
mysql-test/include/not_ubsan.inc
View file @
b91a123d
...
...
@@ -2,7 +2,7 @@
# be overcome. In normal cases one should fix the bug server/test case or in
# the worst case add a (temporary?) suppression in asan.supp or lsan.supp
if
(
`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value
="
UBSAN"`
)
if
(
`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value
LIKE "%
UBSAN"`
)
{
--
skip
Can
'
t
be
run
with
UBSAN
}
mysql-test/include/rpl_stop_server.inc
View file @
b91a123d
...
...
@@ -48,7 +48,9 @@ if ($rpl_debug)
# Send shutdown to the connected server and give
# it 60 seconds (of mysqltest's default) to die before zapping it
shutdown_server
;
let
$rpl_shutdown_timeout
=
`select 60*(1+9*count(*)) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`
;
shutdown_server
$rpl_shutdown_timeout
;
--
source
include
/
wait_until_disconnected
.
inc
...
...
mysql-test/main/sum_distinct-big.test
View file @
b91a123d
...
...
@@ -5,6 +5,7 @@
--
source
include
/
big_test
.
inc
# Test will take more than one hour with valgrind
--
source
include
/
not_valgrind
.
inc
--
source
include
/
not_msan
.
inc
--
source
include
/
have_innodb
.
inc
--
source
include
/
have_sequence
.
inc
...
...
mysql-test/suite/binlog/t/flashback-largebinlog.test
View file @
b91a123d
...
...
@@ -10,11 +10,11 @@
--
let
$mysqlbinlog_output
=
tmp
/
mysqlbinlog_big_1
.
out
--
source
include
/
have_binlog_format_row
.
inc
--
source
include
/
have_log_bin
.
inc
# This is a big test.
--
source
include
/
big_test
.
inc
--
source
include
/
not_msan
.
inc
# Test needs more than 4G of memory
--
source
include
/
have_64bit
.
inc
...
...
mysql-test/suite/maria/max_length.test
View file @
b91a123d
...
...
@@ -6,6 +6,7 @@
--
source
include
/
big_test
.
inc
# This test is too slow for valgrind
--
source
include
/
not_valgrind
.
inc
--
source
include
/
not_msan
.
inc
drop
table
if
exists
t1
,
t2
;
...
...
sql/sys_vars.cc
View file @
b91a123d
...
...
@@ -5078,13 +5078,19 @@ static Sys_var_have Sys_have_symlink(
"--skip-symbolic-links option."
,
READ_ONLY
GLOBAL_VAR
(
have_symlink
),
NO_CMD_LINE
);
#if defined(__SANITIZE_ADDRESS__) || defined(WITH_UBSAN)
#ifdef __SANITIZE_ADDRESS__
#define SANITIZER_MODE "ASAN"
#else
#define SANITIZER_MODE "UBSAN"
#endif
/* __SANITIZE_ADDRESS__ */
#if defined __SANITIZE_ADDRESS__ || defined WITH_UBSAN || __has_feature(memory_sanitizer)
# ifdef __SANITIZE_ADDRESS__
# ifdef WITH_UBSAN
# define SANITIZER_MODE "ASAN+UBSAN"
# else
# define SANITIZER_MODE "ASAN"
# endif
# elif defined WITH_UBSAN
# define SANITIZER_MODE "UBSAN"
# else
# define SANITIZER_MODE "MSAN"
# endif
static
char
*
have_sanitizer
;
static
Sys_var_charptr
Sys_have_santitizer
(
...
...
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