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

11766640 follow-up: fix for VS_CONFIG on Windows

Browse Source
This commit is contained in:
Bjorn Munch 2011-02-24 15:11:05 +01:00
parent b027d10438
commit 7391a6356c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,6 @@ use My::Platform;
use base qw(Exporter);
our @EXPORT= qw(my_find_bin my_find_dir my_find_file NOT_REQUIRED);
our $vs_config_dir;
my $bin_extension= ".exe" if IS_WINDOWS;
# Helper function to be used for fourth parameter to find functions
@ -158,7 +156,8 @@ sub my_find_paths {
# 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= $vs_config_dir || $ENV{MTR_VS_CONFIG} || $ENV{MTR_BUILD_DIR};
my $build_dir= $::opt_config_dir || $ENV{MTR_VS_CONFIG}
|| $ENV{MTR_BUILD_DIR};
push(@extra_dirs, $build_dir) if defined $build_dir;
if (defined $extension){

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

@ -5677,6 +5677,7 @@ sub run_ctest() {
chdir ($bindir) or die ("Could not chdir to $bindir");
my $tinfo;
my $no_ctest= (IS_WINDOWS) ? 256 : -1;
my $ctest_vs= "";
# Just ignore if not configured/built to run ctest
if (! -f "CTestTestfile.cmake") {
@ -5684,9 +5685,12 @@ sub run_ctest() {
return;
}
# Add vs-config option on Windows if needed
$ctest_vs= "-C $opt_vs_config" if IS_WINDOWS && $opt_vs_config;
# Also silently ignore if we don't have ctest and didn't insist
# Now, run ctest and collect output
my $ctest_out= `ctest 2>&1`;
my $ctest_out= `ctest $ctest_vs 2>&1`;
if ($? == $no_ctest && $opt_ctest == -1) {
chdir($olddir);
return;