From: Dyre Tjeldvoll Date: November 15 2012 1:58pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4108 to 4109) List-Archive: http://lists.mysql.com/commits/145275 Message-Id: <20121115135844.26493.99646.4109@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4109 Dyre Tjeldvoll 2012-11-15 Prefer running unit tests with bundled python if available modified: mysql-test/suite/ndb/t/mcc_pyunit.test 4108 Dyre Tjeldvoll 2012-11-14 Add comment and blank line in mtr wrapper modified: mysql-test/suite/ndb/t/mcc_pyunit.test === modified file 'mysql-test/suite/ndb/t/mcc_pyunit.test' --- a/mysql-test/suite/ndb/t/mcc_pyunit.test 2012-11-14 13:07:47 +0000 +++ b/mysql-test/suite/ndb/t/mcc_pyunit.test 2012-11-15 13:58:15 +0000 @@ -17,7 +17,10 @@ chdir($tstdir); #warn `pwd`; my $python = $ENV{'MCC_PYTHON'}; -unless ($python) { $python = "python"; } +unless ($python) { + $python = "$ENV{MYSQL_SHAREDIR}/mcc/Python/python.exe"; + unless (-f $python) { $python = "python"; } +} my $exit_code = system($python, "tst_main.py")/256; if ($exit_code == 0) { No bundle (reason: useless for push emails).