From: Bjorn Munch
Date: February 24 2011 3:28pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3174)
List-Archive: http://lists.mysql.com/commits/132032
Message-Id: <201102241528.p1OFSdG7023861@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0848649570=="

--===============0848649570==
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

 3174 Bjorn Munch	2011-02-24
      vs-config option to ctest made not dependent on Windows

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-24 14:13:23 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-24 15:28:33 +0000
@@ -5680,8 +5680,8 @@ sub run_ctest() {
     return;
   }
 
-  # Add vs-config option on Windows if needed
-  $ctest_vs= "-C $opt_vs_config" if IS_WINDOWS && $opt_vs_config;
+  # Add vs-config option if needed
+  $ctest_vs= "-C $opt_vs_config" if $opt_vs_config;
 
   # Also silently ignore if we don't have ctest and didn't insist
   # Now, run ctest and collect output


--===============0848649570==
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: f01ee060b9e9e2ed87e9c8ca74eb0d869565e53a
# timestamp: 2011-02-24 16:28:39 +0100
# source_branch: file:///home/bm136801/my/main-55/
# base_revision_id: bjorn.munch@stripped\
#   des5y2yhkiz5c6vk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWay3k6EAAXFfgAAQXGP//3oC
AIC////wUAOXcPPZmEk5WElENBNPSh6epiNNU/BJPQGk00aaYap+qDUGh6j1G1NAwgDCepo0MBJQ
CaGpP0SepkyaaABoBoAGSI2kIn6IMFNH6UDIw0CA0EkiNE2Qho1T2mmU1NkPVPU0NAHqbLCFscmB
GjqoQp1PgBAJWW1kbkiPu+rttIJYoVuoCQkRiIm+1RW/dRj/Mda5sFbiPmUhVv+naulWbPytuLUC
ajtkbxFa0LxRVcMM5DS8yv2mMeJItEqsk7F4tTNp32tEPmMEYwuIvG7NKcrHtwtRObxGJUZSwRJQ
T4N8riyXG6tausIJtgxfFsxwuA3Fdnhv5KFIX6xt2Tzb100Rtm3cCjgIhkw4xFNESbBQtq0KmK1Z
4ScwnwYYtiLLdG1SNuwp8Rd/+KeUhrGVJi60RBxk+96fTdWE16GgW7Dwrm7k5dU6kDwCmjjXxTiX
b8kFyi4GqfMW4uhVdZbYOU9FEILjXwKa8BwtE8hz4lCGaliiSYYjnTvymTqpFzpCaadcCFMDOasJ
ZrYVyiuLMXEFKKfFzmovtfcx9zVFqZFjyQRky7nt7HGrys33OYbr7enmkRnIsMfrTrNOWEq5kP1P
ReODEuGuM8oZGZgc8pdPNIz4baigiWm2kNN0n0yRFZ43UjR2FhIHIwGN93N+iBvxDLkr/EfLzFPY
hWzbWsSOiQ/Q/xr+8oxMH9q7vxspeuYpFlqdJHK8/s+2TsiqT8zgJ1HVpdWwF5zeDYTeWrzVrTLv
2WbujWxThx07dzu7sr4Vsyi3S6Mh8NLtvgdUxNLN9TvWRU2uBjCYLMIlHObjDietXKdmyIBsoKS8
Pl1sex6YtBbGpR5CxzO4wLAPEWrBX4xNaZYHLEu66JrKKN5yMAYVY5TEeYfT/njXFKQC8MZ1FfEV
HM64pGG5gmULeH5Weqx5BUFTQjE+hIZSzHppD0pWyRI45KW6gs9yWSReqRf7dFZVHUDJD046k7iu
aLJFAb29SeCH0WE0BTMmXTnLtwBUQDRjSYIH2IH+SNQVKQLJ6u19ronPReiGQaFvNgORHSATVhAO
10JzoCknCUiaMAvopJmZ3bxLLmcGFsQhQtg2ynKX0agEea49E88AMgNQMOHbtduIw92g/ccXPs59
LnOOA1UcayRCIVrNmBzDW0abYuPZ5IxBWl4nO6wBxTLDvM9VWAXSENJ71GX/C8aAzKxWqO6SIm2f
Yu5IpwoSFZbydCA=


--===============0848649570==--