3034 Bjorn Munch 2011-02-25 [merge]
mtr: ignore not finding ctest if in PB2
modified:
mysql-test/mysql-test-run.pl
3033 Bjorn Munch 2011-02-24 [merge]
upmerge some follow-up fixes from 5.5-mtr
modified:
mysql-test/lib/My/Find.pm
mysql-test/mysql-test-run.pl
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2011-02-24 15:48:27 +0000
+++ b/mysql-test/mysql-test-run.pl 2011-02-25 14:21:35 +0000
@@ -5714,9 +5714,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).
| Thread |
|---|
| • bzr push into mysql-trunk-mtr branch (bjorn.munch:3033 to 3034) | Bjorn Munch | 25 Feb |