diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-04-04 12:39:27 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-04-04 12:39:27 +0300 |
| commit | c85ea1ab6d276f90b7b73d99cf357e11ea103822 (patch) | |
| tree | c2fb5428aed83ea60545f5745161f0cdf9461d50 | |
| parent | d1fc3cc469d4429c0a94f4ae282a1162be745bd7 (diff) | |
| download | mariadb-git-c85ea1ab6d276f90b7b73d99cf357e11ea103822.tar.gz | |
MDEV-12439: (Temporary) Don't run MariaRocks tests under valgrind
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/suite.pm | 3 | ||||
| -rw-r--r-- | storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/storage/rocksdb/mysql-test/rocksdb/suite.pm b/storage/rocksdb/mysql-test/rocksdb/suite.pm index 6d7c352dd13..79c630f87f1 100644 --- a/storage/rocksdb/mysql-test/rocksdb/suite.pm +++ b/storage/rocksdb/mysql-test/rocksdb/suite.pm @@ -18,5 +18,8 @@ my $sst_dump= return "RocksDB is not compiled, no sst_dump" unless $sst_dump; $ENV{MARIAROCKS_SST_DUMP}="$sst_dump"; +# Temporarily disable testing under valgrind, due to MDEV-12439 +return "RocksDB tests disabled under valgrind" if ($::opt_valgrind); + bless { }; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def index daa280d4848..8d3fc090273 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def +++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def @@ -51,6 +51,9 @@ collation: Fails on gcc 4.8 and before, MDEV-12433 rocksdb : Intermittent failures in BB unique_sec : Intermittent failures in BB +# See also storage/rocksdb/mysql-test/rocksdb/suite.pm +# Running tests under valgrind is disabled there. + allow_no_pk_concurrent_insert: stress test rocksdb_deadlock_stress_rc: stress test rocksdb_deadlock_stress_rr: stress test |