Commit b1520eb3 authored by unknown's avatar unknown
Browse files

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
parents 39c8672f d3b049a6

mysql-test/mysql-test-run.pl

+15 −13
Original line number Diff line number Diff line
@@ -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,
@@ -734,17 +734,18 @@ sub command_line_setup () { 
  # --------------------------------------------------------------------------

  # 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 ")

      if $opt_vardir;

    mtr_error("Can't use --mem and --tmpdir at the same time ")

      if $opt_tmpdir;



    # Use /dev/shm as the preferred location for vardir and

    # thus implicitly also tmpdir. Add other locations to list

    my @tmpfs_locations= ($opt_mem, "/dev/shm");

    # One could maybe use "mount" to find tmpfs location(s)

    # Search through list of locations that are known

    # to be "fast disks" to list to find a suitable location

    # Use --mem=<dir> as first location to look.

    my @tmpfs_locations= ($opt_mem, "/dev/shm", "/tmp");



    foreach my $fs (@tmpfs_locations)

    {

      if ( -d $fs )
@@ -4307,13 +4308,11 @@ sub run_mysqltest ($) { 
  if ( $opt_ssl )

  {

    # Turn on SSL for _all_ test cases if option --ssl was used

    mtr_add_arg($args, "--ssl",

		$glob_mysql_test_dir);

    mtr_add_arg($args, "--ssl");

  }

  elsif ( $opt_ssl_supported )

  {

    mtr_add_arg($args, "--skip-ssl",

		$glob_mysql_test_dir);

    mtr_add_arg($args, "--skip-ssl");

  }



  # ----------------------------------------------------------------------
@@ -4648,9 +4647,12 @@ Options to control directories to use 
  vardir=DIR            The directory where files generated from the test run

                        is stored (default: ./var). Specifying a ramdisk or

                        tmpfs will speed up tests.

  mem                   Run testsuite in "memory" using tmpfs if

                        available(default: /dev/shm)

                        reads path from MTR_MEM environment variable

  mem[=DIR]             Run testsuite in "memory" using tmpfs or ramdisk

                        Attempts to use DIR first if specified else

                        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