Commit c6d31783 authored by unknown's avatar unknown
Browse files

mysql-test-run.pl: 

  Test for base directory when a RPM install corrected


mysql-test/mysql-test-run.pl:
  Test for base directory when a RPM install corrected
parent aa341c49

mysql-test/mysql-test-run.pl

+14 −6
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ sub initial_setup () { 


  $glob_hostname=  mtr_short_hostname();



  # 'basedir' is always above "mysql-test" directory ...

  # Find the absolute path to the test directory

  $glob_mysql_test_dir=  cwd();

  if ( $glob_cygwin_perl )

  {
@@ -475,10 +475,18 @@ sub initial_setup () { 
    $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;

    chomp($glob_mysql_test_dir);

  }

  # ... direct parent for "tar.gz" installations, ...



  # In most cases, the base directory we find everything relative to,

  # is the parent directory of the "mysql-test" directory. For source

  # distributions, TAR binary distributions and some other packages.

  $glob_basedir= dirname($glob_mysql_test_dir);

  # ... or one more level up, for RPM installations.

  if ( ! -d "$glob_basedir/bin" )



  # In the RPM case, binaries and libraries are installed in the

  # default system locations, instead of having our own private base

  # directory. And we install "/usr/share/mysql-test". Moving up one

  # more directory relative to "mysql-test" gives us a usable base

  # directory for RPM installs.

  if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" )

  {

    $glob_basedir= dirname($glob_basedir);

  }