database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Update of --mem flag after comments

Browse Source 
mysql-test/mysql-test-run.pl:
  Allow --mem to be specified as a flag or --mem=<dir>
  Add /tmp to locations to search
  Update comments and usage description
This commit is contained in:
unknown
2006-11-08 23:16:44 +01:00
parent 26e6d78845
commit d3b049a6bf
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/mysql-test-run.pl
View File

@ -667,7 +667,7 @@ sub command_line_setup () {
'tmpdir=s' => \$opt_tmpdir, 'tmpdir=s' => \$opt_tmpdir,
'vardir=s' => \$opt_vardir, 'vardir=s' => \$opt_vardir,
'benchdir=s' => \$glob_mysql_bench_dir, 'benchdir=s' => \$glob_mysql_bench_dir,
'mem' => \$opt_mem, 'mem:s' => \$opt_mem,
# Misc # Misc
'comment=s' => \$opt_comment, 'comment=s' => \$opt_comment,
@ -747,17 +747,18 @@ sub command_line_setup () {
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Check if we should speed up tests by trying to run on tmpfs # Check if we should speed up tests by trying to run on tmpfs
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
if ( $opt_mem ) if ( defined $opt_mem )
{ {
mtr_error("Can't use --mem and --vardir at the same time ") mtr_error("Can't use --mem and --vardir at the same time ")
if $opt_vardir; if $opt_vardir;
mtr_error("Can't use --mem and --tmpdir at the same time ") mtr_error("Can't use --mem and --tmpdir at the same time ")
if $opt_tmpdir; if $opt_tmpdir;
# Use /dev/shm as the preferred location for vardir and # Search through list of locations that are known
# thus implicitly also tmpdir. Add other locations to list # to be "fast disks" to list to find a suitable location
my @tmpfs_locations= ($opt_mem, "/dev/shm"); # Use --mem=<dir> as first location to look.
# One could maybe use "mount" to find tmpfs location(s) my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp");
foreach my $fs (@tmpfs_locations) foreach my $fs (@tmpfs_locations)
{ {
if ( -d $fs ) if ( -d $fs )
@ -4630,9 +4631,12 @@ Options to control directories to use
vardir=DIR The directory where files generated from the test run vardir=DIR The directory where files generated from the test run
is stored (default: ./var). Specifying a ramdisk or is stored (default: ./var). Specifying a ramdisk or
tmpfs will speed up tests. tmpfs will speed up tests.
mem Run testsuite in "memory" using tmpfs if mem[=DIR] Run testsuite in "memory" using tmpfs or ramdisk
available(default: /dev/shm) Attempts to use DIR first if specified else
reads path from MTR_MEM environment variable uses as builtin list of standard locations
for tmpfs (/dev/shm)
The option can also be set using environment
variable MTR_MEM=[DIR]
Options to control what test suites or cases to run Options to control what test suites or cases to run