database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-19129: Xcode compatibility update: mysql-test-run.pl: rename $opt_vs_config to $multiconfig to use with other cmake multiconfig generators

Browse Source
This commit is contained in:
Sergei Krivonos
2021-10-21 15:21:44 +03:00
parent 39f63f6643
commit 7d6617e966
8 changed files with 46 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/My/Find.pm
View File

@@ -159,7 +159,7 @@ sub my_build_path_list {
# User can select to look in a special build dir
# which is a subdirectory of any of the paths
my @extra_dirs;
my $build_dir= $::opt_vs_config || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR};
my $build_dir= $::multiconfig || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR};
push(@extra_dirs, $build_dir) if defined $build_dir;
if (defined $extension){

8
mysql-test/lib/v1/mysql-test-run.pl
View File

@@ -141,7 +141,7 @@ our $opt_tmpdir; # A path but set directly on cmd line
# configuration used to build them. To make life easier, an environment
# variable or command-line option may be specified to control which set of
# executables will be used by the test suite.
our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
our $multiconfig = $ENV{'MTR_VS_CONFIG'};
our $default_vardir;
@@ -502,7 +502,7 @@ sub command_line_setup () {
'compress' => \$opt_compress,
'bench' => \$opt_bench,
'small-bench' => \$opt_small_bench,
'vs-config' => \$opt_vs_config,
'vs-config' => \$multiconfig,
# Control what test suites or cases to run
'force' => \$opt_force,
@@ -2213,9 +2213,9 @@ sub vs_config_dirs ($$) {
$exe = "" if not defined $exe;
if ($opt_vs_config)
if ($multiconfig)
{
return ("$glob_bindir/$path_part/$opt_vs_config/$exe");
return ("$glob_bindir/$path_part/$multiconfig/$exe");
}
return ("$glob_bindir/$path_part/release/$exe",