diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:38:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-06 13:38:39 +0200 |
| commit | 4ccb2be65fc1d392602473d50f8d9df29635a3eb (patch) | |
| tree | 213b3f9165198c14382daa56e53c538fbc1d3602 /mysql-test/include | |
| parent | 0bf400a19a14e257a28a99b0f102c799ab3de49b (diff) | |
| parent | 46a7603813e74b48e948a5287c40a93fbb5bbf4d (diff) | |
| download | mariadb-git-4ccb2be65fc1d392602473d50f8d9df29635a3eb.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/not_valgrind_build.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/not_valgrind_build.inc b/mysql-test/include/not_valgrind_build.inc index 2b60f11bfc7..b62a1bc953b 100644 --- a/mysql-test/include/not_valgrind_build.inc +++ b/mysql-test/include/not_valgrind_build.inc @@ -1,4 +1,4 @@ -if (`select version() like '%valgrind%'`) +if (`select version() like '%valgrind%' || version() like '%asan%'`) { - skip Does not run with binaries built with valgrind; + skip Does not run with binaries built with valgrind or asan; } |