From 0bd4c22236819dc3f45fea146a48b4167a8ed901 Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Fri, 25 Feb 2011 14:51:25 +0100 Subject: [PATCH] mtr: ignore not finding ctest if in PB2 --- mysql-test/mysql-test-run.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index da5e6a81b32..97737443e1c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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; }