1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtr: remove --use-copy, autodetect symlink support instead

Browse Source
This commit is contained in:
Sergei Golubchik 2014-03-27 12:04:34 +01:00
parent 42263a2b0a
commit 3b33caaca3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,7 +237,6 @@ our $opt_fast= 0;
our $opt_force= 0; our $opt_force= 0;
our $opt_mem= $ENV{'MTR_MEM'}; our $opt_mem= $ENV{'MTR_MEM'};
our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'}; our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};
our $opt_use_copy= 0;
our $opt_gcov; our $opt_gcov;
our $opt_gcov_src_dir; our $opt_gcov_src_dir;
@ -1144,7 +1143,6 @@ sub command_line_setup {
# skip-im is deprecated and silently ignored # skip-im is deprecated and silently ignored
'skip-im' => \&ignore_option, 'skip-im' => \&ignore_option,
'staging-run' => \$opt_staging_run, 'staging-run' => \$opt_staging_run,
'use-copy' => \$opt_use_copy,
# Specify ports # Specify ports
'build-thread|mtr-build-thread=i' => \$opt_build_thread, 'build-thread|mtr-build-thread=i' => \$opt_build_thread,
@ -2681,7 +2679,7 @@ sub setup_vardir() {
# and make them world readable # and make them world readable
copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data", "0022"); copytree("$glob_mysql_test_dir/std_data", "$opt_vardir/std_data", "0022");
# create a plugin dir and copy plugins into it # create a plugin dir and copy or symlink plugins into it
if ($source_dist) if ($source_dist)
{ {
$plugindir="$opt_vardir/plugins"; $plugindir="$opt_vardir/plugins";
@ -2699,6 +2697,13 @@ sub setup_vardir() {
} }
else else
{ {
my $opt_use_copy= 1;
if (symlink "$opt_vardir/run", "$plugindir/symlink_test")
{
$opt_use_copy= 0;
unlink "$plugindir/symlink_test";
}
for (<../storage/*/.libs/*.so>, for (<../storage/*/.libs/*.so>,
<../plugin/*/.libs/*.so>, <../plugin/*/.libs/*.so>,
<../plugin/*/*/.libs/*.so>, <../plugin/*/*/.libs/*.so>,
@ -6423,9 +6428,6 @@ Options to control what test suites or cases to run
skip-test-list=FILE Skip the tests listed in FILE. Each line in the file skip-test-list=FILE Skip the tests listed in FILE. Each line in the file
is an entry and should be formatted as: is an entry and should be formatted as:
<TESTNAME> : <COMMENT> <TESTNAME> : <COMMENT>
use-copy Copy plugins instead of symlinking them. This is
only useful when running on a system that doesn't
support symlinks.
Options that specify ports Options that specify ports