summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorDaniel Black <grooverdan@users.sourceforge.net>2015-04-27 21:15:23 +1000
committerDaniel Black <grooverdan@users.sourceforge.net>2015-04-27 21:15:23 +1000
commit574227c90c7847bfb7c0c18094fcd29849425f00 (patch)
tree112b3ab13a6e30522bffb0088f79a7e9e86f1a16 /mysql-test
parentf8320210e78232fed350754faf72d14af63d0c3e (diff)
downloadmariadb-git-574227c90c7847bfb7c0c18094fcd29849425f00.tar.gz
/run/shm is the general replacement for /dev/shm in newer distros
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d9322cf2ee1..566423a1c07 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1462,7 +1462,7 @@ sub command_line_setup {
# Search through list of locations that are known
# to be "fast disks" to find a suitable location
# Use --mem=<dir> as first location to look.
- my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp");
+ my @tmpfs_locations= ($opt_mem,"/run/shm", "/dev/shm", "/tmp");
foreach my $fs (@tmpfs_locations)
{
@@ -6367,7 +6367,7 @@ Options to control directories to use
mem Run testsuite in "memory" using tmpfs or ramdisk
Attempts to find a suitable location
using a builtin list of standard locations
- for tmpfs (/dev/shm)
+ for tmpfs (/run/shm, /dev/shm, /tmp)
The option can also be set using environment
variable MTR_MEM=[DIR]
clean-vardir Clean vardir if tests were successful and if