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
4099 Dyre Tjeldvoll 2012-11-01
MTR wrapper for python unit tests
added:
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-01 10:45:26 +0000
+++ b/mysql-test/suite/ndb/t/mcc_pyunit.test 2012-11-02 11:58:09 +0000
@@ -1,7 +1,9 @@
--perl
use strict;
-chdir "../storage/ndb/mcc/tst";
+if (-d "../storage/ndb/mcc/tst") { chdir("../storage/ndb/mcc/tst"); }
+if (-d "../share/mcc/tst") { chdir("../share/mcc/tst"); }
+
my $exit_code = system("python", "tst_main.py")/256;
if ($exit_code == 0)
{
=== modified file 'storage/ndb/mcc/CMakeLists.txt'
--- a/storage/ndb/mcc/CMakeLists.txt 2012-10-26 10:34:03 +0000
+++ b/storage/ndb/mcc/CMakeLists.txt 2012-11-02 11:58:09 +0000
@@ -155,6 +155,9 @@ install(FILES clusterhost.py remote_clus
util.py config_parser.py cfg.pem ${CMAKE_CURRENT_BINARY_DIR}/post-install.py DESTINATION "${MCC_INSTALL_SUBDIR}"
COMPONENT ClusterTools)
+install(DIRECTORY tst DESTINATION "${MCC_INSTALL_SUBDIR}"
+ COMPONENT ClusterTools)
+
if(NOT DEFAULT_MYSQL_HOME)
if(WIN32)
SETIFUNDEF_(MCC_CPACK_CMAKE_GENERATOR "Visual Studio 9 2008")
=== modified file 'storage/ndb/mcc/tst/tst_main.py'
--- a/storage/ndb/mcc/tst/tst_main.py 2012-10-25 08:06:40 +0000
+++ b/storage/ndb/mcc/tst/tst_main.py 2012-11-02 11:58:09 +0000
@@ -45,7 +45,7 @@ import logging
import request_handler
import config_parser
-import clumodel
+#import clumodel
import util
from util import mock_msg, is_set
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4099 to 4100) | Dyre Tjeldvoll | 6 Nov |