From: Dyre Tjeldvoll Date: November 2 2012 2:31pm Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4100 to 4101) List-Archive: http://lists.mysql.com/commits/145166 Message-Id: <20121102143142.9022.36667.4101@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4101 Dyre Tjeldvoll 2012-11-02 Look up MYSQL_SHAREDIR from env to locate unit tests for different layouts modified: mysql-test/suite/ndb/t/mcc_pyunit.test 4100 Dyre Tjeldvoll 2012-11-02 Install tst dir so that unit tests can be run on packages modified: mysql-test/suite/ndb/t/mcc_pyunit.test storage/ndb/mcc/CMakeLists.txt storage/ndb/mcc/tst/tst_main.py === modified file 'mysql-test/suite/ndb/t/mcc_pyunit.test' --- a/mysql-test/suite/ndb/t/mcc_pyunit.test 2012-11-02 11:58:09 +0000 +++ b/mysql-test/suite/ndb/t/mcc_pyunit.test 2012-11-02 14:31:03 +0000 @@ -1,8 +1,10 @@ --perl use strict; -if (-d "../storage/ndb/mcc/tst") { chdir("../storage/ndb/mcc/tst"); } -if (-d "../share/mcc/tst") { chdir("../share/mcc/tst"); } +# Assume source package layout first... then try install/package layout +warn `env`; +chdir("../storage/ndb/mcc/tst") || chdir($ENV{MYSQL_SHAREDIR} . "/mcc/tst"); +warn `pwd`; my $exit_code = system("python", "tst_main.py")/256; if ($exit_code == 0) No bundle (reason: useless for push emails).