diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-07 12:57:30 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-07 12:57:30 +0100 |
| commit | 7a7e4d5d69a28f28c04cf94ac4bdbcb23b4d5d84 (patch) | |
| tree | 7fa8ad4f8f5d7d942f233b9bcd6c2eefdaa2a746 /mysql-test/mysql-test-run.pl | |
| parent | 5ecb34c2274f6d51455e7353a7d5686e30b79602 (diff) | |
| parent | 3893f907649675541c16550b7d4fd8a8b29f5c55 (diff) | |
| download | mariadb-git-7a7e4d5d69a28f28c04cf94ac4bdbcb23b4d5d84.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 3aeca32f2e8..fb1b614b52d 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -185,7 +185,7 @@ our $opt_fast; our $opt_force; our $opt_reorder= 0; our $opt_enable_disabled; -our $opt_mem; +our $opt_mem= $ENV{'MTR_MEM'}; our $opt_gcov; our $opt_gcov_err; @@ -591,7 +591,7 @@ sub command_line_setup () { 'tmpdir=s' => \$opt_tmpdir, 'vardir=s' => \$opt_vardir, 'benchdir=s' => \$glob_mysql_bench_dir, - 'mem' => \$opt_mem, + 'mem=s' => \$opt_mem, # Misc 'comment=s' => \$opt_comment, @@ -743,7 +743,7 @@ sub command_line_setup () { # Use /dev/shm as the preferred location for vardir and # thus implicitly also tmpdir. Add other locations to list - my @tmpfs_locations= ("/dev/shm"); + my @tmpfs_locations= ($opt_mem, "/dev/shm"); # One could maybe use "mount" to find tmpfs location(s) foreach my $fs (@tmpfs_locations) { @@ -4645,7 +4645,7 @@ Options to control directories to use tmpfs will speed up tests. mem=DIR Run testsuite in "memory" using tmpfs if available(default: /dev/shm) - + reads from MTR_MEM environment variable Options to control what test suites or cases to run |