From: Bjorn Munch Date: February 25 2011 2:24pm Subject: bzr push into mysql-5.5-mtr branch (bjorn.munch:3174 to 3175) List-Archive: http://lists.mysql.com/commits/132062 Message-Id: <201102251424.p1PEOw0x024849@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3175 Bjorn Munch 2011-02-25 mtr: ignore not finding ctest if in PB2 modified: mysql-test/mysql-test-run.pl 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 15:28:33 +0000 +++ b/mysql-test/mysql-test-run.pl 2011-02-25 13:51:25 +0000 @@ -5684,9 +5684,10 @@ sub run_ctest() { $ctest_vs= "-C $opt_vs_config" if $opt_vs_config; # Also silently ignore if we don't have ctest and didn't insist + # Special override: also ignore in Pushbuild, some platforms may not have it # Now, run ctest and collect output my $ctest_out= `ctest $ctest_vs 2>&1`; - if ($? == $no_ctest && $opt_ctest == -1) { + if ($? == $no_ctest && $opt_ctest == -1 && ! defined $ENV{PB2WORKDIR}) { chdir($olddir); return; } No bundle (reason: useless for push emails).