diff options
author | Bjorn Munch <bjorn.munch@oracle.com> | 2013-09-10 07:25:01 +0200 |
---|---|---|
committer | Bjorn Munch <bjorn.munch@oracle.com> | 2013-09-10 07:25:01 +0200 |
commit | 1f3994fac62b9a668186006f714bb4118794024d (patch) | |
tree | 60fbc7d49771a557ef45cc3b0c9b6d874e7c1366 | |
parent | 6f33e36e23e0e7264cd05973b0263d6cc13c5676 (diff) | |
download | mariadb-git-1f3994fac62b9a668186006f714bb4118794024d.tar.gz |
MTR: fix broken logic for ignoring missing ctest in Pushbuild
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 19f82303221..54dcd982a4c 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5998,7 +5998,7 @@ sub run_ctest() { # 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 && ! defined $ENV{PB2WORKDIR}) { + if ($? == $no_ctest && ($opt_ctest == -1 || defined $ENV{PB2WORKDIR})) { chdir($olddir); return; } |