revision-id: 7345c0de26a8e9a88c88a5b5502beb3250b9429e (mariadb-10.2.25-17-g7345c0de26a) parent(s): 622ecfc7c6ab4adb3720687dfae623824b1454a5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-06-20 21:34:15 +0300 message: Fix tests: some build hosts have ramdisk in /run/shm instead of /dev/shm --- storage/rocksdb/mysql-test/rocksdb/include/have_direct_io.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/include/have_direct_io.inc b/storage/rocksdb/mysql-test/rocksdb/include/have_direct_io.inc index 49509af5bd2..d9b4b46b25a 100644 --- a/storage/rocksdb/mysql-test/rocksdb/include/have_direct_io.inc +++ b/storage/rocksdb/mysql-test/rocksdb/include/have_direct_io.inc @@ -8,7 +8,8 @@ use Cwd 'abs_path'; open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/data_in_shm.inc") or die; my $real_path= abs_path($ENV{'MYSQLTEST_VARDIR'}); -my $in_shm= index($real_path, "/dev/shm") != -1; +my $in_shm= (index($real_path, "/dev/shm") != -1) || + (index($real_path, "/run/shm") != -1); print FILE "let \$DATA_IN_SHM= $in_shm;\n"; close FILE; EOF @@ -18,5 +19,5 @@ EOF if ($DATA_IN_SHM) { - --skip DATADIR is in /dev/shm, possibly due to --mem + --skip DATADIR is in /{dev|run}/shm, possibly due to --mem }