Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
3b33caac
Commit
3b33caac
authored
Mar 27, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtr: remove --use-copy, autodetect symlink support instead
parent
42263a2b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+8
-6
No files found.
mysql-test/mysql-test-run.pl
View file @
3b33caac
...
@@ -237,7 +237,6 @@ our $opt_fast= 0;
...
@@ -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 {
...
@@ -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() {
...
@@ -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() {
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment