From: Bjorn Munch
Date: February 24 2011 2:11pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3170)
List-Archive: http://lists.mysql.com/commits/132024
Message-Id: <201102241411.p1OEBCoE019243@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1718488836=="

--===============1718488836==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/bm136801/my/mtr-55/ based on revid:bjorn.munch@stripped

 3170 Bjorn Munch	2011-02-24
      11766640 follow-up: fix for VS_CONFIG on Windows

    modified:
      mysql-test/lib/My/Find.pm
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/lib/My/Find.pm'
--- a/mysql-test/lib/My/Find.pm	2011-01-18 10:21:37 +0000
+++ b/mysql-test/lib/My/Find.pm	2011-02-24 14:11:05 +0000
@@ -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){

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-21 12:56:43 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-24 14:11:05 +0000
@@ -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;


--===============1718488836==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/mtr-55/
# testament_sha1: 65638b39ef4ad5d69986d74a05801f0c245035d9
# timestamp: 2011-02-24 15:11:12 +0100
# source_branch: file:///home/bm136801/my/main-55/
# base_revision_id: bjorn.munch@stripped\
#   lqzhjmt3kfqw3zpi
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRXqyHoAAkX/gAAQAADdY///
f6efgP////5QBQPDp01rjdjlD0PXCURCaaMRoNMTUZM0pp4U0ZDag2mEnpP0p6glJNJtNU/VPank
p6j1DMUMgNA0aA0AAAJUKafqT9JTaI8Ihk9TCBhGhgI0ABpoMqjTT1Bo0DJoNABo00ANMmQAACSQ
TSYNJppppT2ianqbTSmaTQZANANBkSxk6MGru9b20WXqzzglQxTYKIhJ1AsJjxvuPNhecs3wYJ2j
F6nQ5q5op+kmM/JeFBVVU5eqFpx4W6t9Wq6uLm1t9UlUfYrB/f3b4eakvAk1QdPad2TLQjSG39s8
bqBYZkxqo67/h/Wd2yRZXeZBOLkh6Rzb0t4WlqStMKtczHnleBWtZQaUFFvx7Zm7dZxErkBasR1c
DMpikzdzC117ekPOEGQnkhkKZSTHoUMR5R8K41hJU0X6jVHWfECcwJ50dJuBdRgKFuLetqFrAiXy
MFEkNRZSoPFaPVd9fudVJweBpZejiEZGRiSPKcp7Xc2pMih5ceim4yMtw8IZX7Bml7UBpuuuNrGx
wWsA8gG4/xwG6FmLiY1c3ZMh1W2dMi0pA7j6TX4NUxtocuCyklrkR5LbRhjs3wHtup07nWEw0YSV
Y0tOh3rPS0y4FrwTgrAcuMIykszu5UwEzlRibh2EJjwNRE4GjXgXUj77CLLeiyovmbJFL9EtzXA5
Sgq1yEuN4uDnoKtKnXbWkZM1wjoiFGpwuKIGQNYI7LWHpqKHkg4GIHy7DYDEs7MjAsJnnZRMMDeb
MAwExejcaRCjRkSZy7w1VUSLBlE74yKnK2SjrHyiqbjORCqsvsJwo5aUz10L3Tc8VOqFDQqcHGTw
aTRWpFh9e/ynrxeSayrQTxqLnKWqCwbS5m0iJC9CKiqte7FpanLjYpGkXE4nvX7Ru9RjPcuG4erH
X+gys8IL1wW206cS2xncZasmVpMiL4q92sQM1vS4IubwDYeIv3s/PSIkI960M8Bi806JkTswudfU
buSBUVkhVlp5xvWZmCzQQym8xo78ld4mTcPLWUYTFYuOnFIWSFIRdEDeQAmTdcaoiUbxEk89SbcA
TJTRhI0pxZ3dE47IpYCQfBjiH6gOuCKmzUl4gHIM3Bwf9IRAejKdcTmFdBqiPiQW/U1qxpaQu1TG
eg+FyKBlHZLYvLU6ORP4Vg5MNiTooQy4Y6eF2aIDMUoz9j0QiasAxOBtvMHQA9Wi1LcHkd5M8Rpx
cHzepNrN4HErGRe48BPn4ga/RI7xklxFIjhmqAjS0t9EcmXgT00ram70FyF1bM5lTsC4bGCOkaj9
IHJH4Gz5dM31eZFx50dOQFkTcQMYdChcj6/UJcpHdwetEeviunMP4kBgjCAXqwSYtY8rO3TfPpX4
3K8H61Qha/Ad1VhyvPLSkljKSgm+oS5dlt9uAY3TtBhJ6c8bxGVJC1hKIjaQih/bVxLzQUWBkxcz
hVdJckzAg5YhtxgEBjSESPwJaIilUk2EjSq2WhzMOos+F17DBFVbFzFdKiIavMW9qN5FE/XiuhKl
Vc+GXI8AG0IUJB2klh4ZqnhIQVuy9hGPCgcteyLkQ2vhZJlUTQxINvge5mbv70ViNSGHDsS3Hs45
rjDbEicAZPIufPrpizgY3g2yvPheW2IuU2cRcFaxsbMTEztESM9z6YWgYh5OyCQA1hIFmooKMCLC
95T5svSbiywCBM66RRhYs2Y1HLygi8dVvM44YZEvsFS1DFUl49Cs6z1/v/i7kinChICvVkPQ


--===============1718488836==--